On Wed, Oct 02, 2013 at 02:33:06PM +0200, Klaus Aehlig wrote: > During upgrades, gnt-cluster needs to wait for
Wait for what ? > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > lib/constants.py | 5 +++++ > src/Ganeti/HsConstants.hs | 8 ++++++++ > 2 files changed, 13 insertions(+) > > diff --git a/lib/constants.py b/lib/constants.py > index 71e1278..fe25cb0 100644 > --- a/lib/constants.py > +++ b/lib/constants.py > @@ -2264,6 +2264,11 @@ MOND_TIME_INTERVAL = _constants.MOND_TIME_INTERVAL > # MonD's latest API version > MOND_LATEST_API_VERSION = 1 > > +# Timeouts for upgrades > + > +UPGRADE_QUEUE_DRAIN_TAIMEOUT = _constants.UPGRADE_QUEUE_DRAIN_TAIMEOUT s/TAIMEOUT/TIMEOUT/g and the Haskell ones too > +UPGRADE_QUEUE_POLL_INTERVALL = _constants.UPGRADE_QUEUE_POLL_INTERVALL s/INTERVALL/INTERVAL/g and the Haskell ones too Thanks, Jose > + > # Do not re-export imported modules > del re, _vcsversion, _constants, socket, pathutils, compat > > diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs > index 26be737..c22e055 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -1393,3 +1393,11 @@ statFile = "/proc/stat" > -- | Mond's variable for periodical data collection > mondTimeInterval :: Int > mondTimeInterval = 5 > + > +-- | Timeout for queue draining in upgrades > +upgradeQueueDrainTaimeout :: Int > +upgradeQueueDrainTaimeout = 36 * 60 * 60 -- 1.5 days > + > +-- | Intervall at which the queue is polled during upgrades > +upgradeQueuePollIntervall :: Int > +upgradeQueuePollIntervall = 10 > -- > 1.8.4 > -- Jose Antonio Lopes Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
