On Tue, Jul 14, 2015 at 05:59:30PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
...so that the maintenance daemon can query for the
interval at which to run.
Signed-off-by: Klaus Aehlig <[email protected]>
---
src/Ganeti/WConfd/Core.hs | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/Ganeti/WConfd/Core.hs b/src/Ganeti/WConfd/Core.hs
index d327002..7f142bb 100644
--- a/src/Ganeti/WConfd/Core.hs
+++ b/src/Ganeti/WConfd/Core.hs
@@ -61,7 +61,9 @@ import Ganeti.Locking.Locks ( GanetiLocks(ConfigLock, BGL)
, lockLevel, LockLevel
, ClientType(ClientOther), ClientId(..) )
import qualified Ganeti.Locking.Waiting as LW
-import Ganeti.Objects (ConfigData, DRBDSecret, LogicalVolume, Ip4Address)
+import Ganeti.Objects ( ConfigData, DRBDSecret, LogicalVolume, Ip4Address
+ , configMaintenance, maintRoundDelay
+ )
import Ganeti.Objects.Lens (configClusterL, clusterMasterNodeL)
import Ganeti.WConfd.ConfigState (csConfigDataL)
import qualified Ganeti.WConfd.ConfigVerify as V
@@ -154,6 +156,13 @@ writeConfigAndUnlock cid cdata = do
flushConfig :: WConfdMonad ()
flushConfig = forceConfigStateDistribution
+-- *** Access to individual parts of the configuration
+
+-- | Get the configurable value of the maintenance interval
+maintenanceRoundDelay :: WConfdMonad Int
+maintenanceRoundDelay = liftM ( maintRoundDelay . configMaintenance )
+ CW.readConfig
+
-- ** Temporary reservations related functions
dropAllReservations :: ClientId -> WConfdMonad ()
@@ -384,6 +393,7 @@ exportedFunctions = [ 'echo
, 'unlockConfig
, 'writeConfigAndUnlock
, 'flushConfig
+ , 'maintenanceRoundDelay
-- temporary reservations (common)
, 'dropAllReservations
-- DRBD
--
2.4.3.573.g4eafbef
LGTM
