On Thu, Jul 23, 2015 at 07:33:58PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
...so that the maintenance daemon can ask WConfD whether and how
it should do balancing.
Signed-off-by: Klaus Aehlig <[email protected]>
---
src/Ganeti/WConfd/Core.hs | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/Ganeti/WConfd/Core.hs b/src/Ganeti/WConfd/Core.hs
index c478a87..0ec540e 100644
--- a/src/Ganeti/WConfd/Core.hs
+++ b/src/Ganeti/WConfd/Core.hs
@@ -63,6 +63,7 @@ import Ganeti.Locking.Locks ( GanetiLocks(ConfigLock, BGL)
import qualified Ganeti.Locking.Waiting as LW
import Ganeti.Objects ( ConfigData, DRBDSecret, LogicalVolume, Ip4Address
, configMaintenance, maintRoundDelay, maintJobs
+ , maintBalance, maintBalanceThreshold
)
import Ganeti.Objects.Lens (configClusterL, clusterMasterNodeL)
import Ganeti.Types (JobId)
@@ -168,6 +169,11 @@ maintenanceRoundDelay = liftM ( maintRoundDelay .
configMaintenance )
maintenanceJobs :: WConfdMonad [JobId]
maintenanceJobs = liftM ( maintJobs . configMaintenance ) CW.readConfig
+-- | Get the information related to balancing for the maintenance daemon.
+maintenanceBalancing :: WConfdMonad (Bool, Double)
+maintenanceBalancing = liftM ((maintBalance &&& maintBalanceThreshold)
+ . configMaintenance) CW.readConfig
+
-- ** Temporary reservations related functions
dropAllReservations :: ClientId -> WConfdMonad ()
@@ -400,6 +406,7 @@ exportedFunctions = [ 'echo
, 'flushConfig
, 'maintenanceRoundDelay
, 'maintenanceJobs
+ , 'maintenanceBalancing
-- temporary reservations (common)
, 'dropAllReservations
-- DRBD
--
2.4.3.573.g4eafbef
LGTM
