LGTM. Thanks, Jose
On Fri, Oct 04, 2013 at 01:16:52PM +0200, Klaus Aehlig wrote: > On Fri, Oct 04, 2013 at 11:51:45AM +0200, Jose A. Lopes wrote: > > On Wed, Oct 02, 2013 at 02:33:06PM +0200, Klaus Aehlig wrote: > > > During upgrades, gnt-cluster needs to wait for > > > > Wait for what ? > > reworded to > > > Provide time constants related to upgrades > > During upgrades, gnt-cluster needs to wait for all jobs > in the queue to finish. Provide constants for timeout and > polling interval. > > > > > +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 > > > > > Interdiff: > > diff --git a/lib/constants.py b/lib/constants.py > index b1e4e62..5b11f75 100644 > --- a/lib/constants.py > +++ b/lib/constants.py > @@ -2278,8 +2278,8 @@ MOND_LATEST_API_VERSION = 1 > > # Timeouts for upgrades > > -UPGRADE_QUEUE_DRAIN_TAIMEOUT = _constants.UPGRADE_QUEUE_DRAIN_TAIMEOUT > -UPGRADE_QUEUE_POLL_INTERVALL = _constants.UPGRADE_QUEUE_POLL_INTERVALL > +UPGRADE_QUEUE_DRAIN_TIMEOUT = _constants.UPGRADE_QUEUE_DRAIN_TIMEOUT > +UPGRADE_QUEUE_POLL_INTERVAL = _constants.UPGRADE_QUEUE_POLL_INTERVAL > > # 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 63d4356..f043ff2 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -1397,9 +1397,9 @@ diskValidAccessModes = > ConstantUtils.mkSet $ map Types.diskAccessModeToRaw [minBound..] > > -- | Timeout for queue draining in upgrades > -upgradeQueueDrainTaimeout :: Int > -upgradeQueueDrainTaimeout = 36 * 60 * 60 -- 1.5 days > +upgradeQueueDrainTimeout :: Int > +upgradeQueueDrainTimeout = 36 * 60 * 60 -- 1.5 days > > -- | Intervall at which the queue is polled during upgrades > -upgradeQueuePollIntervall :: Int > -upgradeQueuePollIntervall = 10 > +upgradeQueuePollInterval :: Int > +upgradeQueuePollInterval = 10 > > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores -- 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
