LGTM
On 10/19/2015 03:57 PM, 'Klaus Aehlig' via ganeti-devel wrote:
This option will be used to tell the MonD backend of htools
to take instance memory load data into account by using the
appropriate data collector.
Signed-off-by: Klaus Aehlig <[email protected]>
---
src/Ganeti/HTools/CLI.hs | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/Ganeti/HTools/CLI.hs b/src/Ganeti/HTools/CLI.hs
index 98a7e33..b712c62 100644
--- a/src/Ganeti/HTools/CLI.hs
+++ b/src/Ganeti/HTools/CLI.hs
@@ -61,6 +61,7 @@ module Ganeti.HTools.CLI
, oDynuFile
, oMonD
, oMonDDataFile
+ , oMonDKvmRSS
, oMonDXen
, oEvacMode
, oMonDExitMissing
@@ -162,6 +163,8 @@ data Options = Options
-- by MonDs
, optMonDXen :: Bool -- ^ Should Xen-specific collectors be
-- considered (only if MonD is queried)
+ , optMonDKvmRSS :: Bool -- ^ Should kvm RSS information be
+ -- considered (only if MonD is queried)
, optMonDExitMissing :: Bool -- ^ If the program should exit on
missing
-- MonD data
, optEvacMode :: Bool -- ^ Enable evacuation mode
@@ -236,6 +239,7 @@ defaultOptions = Options
, optMonD = False
, optMonDFile = Nothing
, optMonDXen = False
+ , optMonDKvmRSS = False
, optMonDExitMissing = False
, optEvacMode = False
, optRestrictedMigrate = False
@@ -379,6 +383,13 @@ oMonDXen =
"also consider xen-specific collectors in MonD queries",
OptComplNone)
+oMonDKvmRSS :: OptType
+oMonDKvmRSS =
+ (Option "" ["mond-kvm-rss"]
+ (NoArg (\ opts -> Ok opts { optMonDKvmRSS = True }))
+ "also consider residual-set-size data for kvm instances via MonD",
+ OptComplNone)
+
oMonDExitMissing :: OptType
oMonDExitMissing =
(Option "" ["exit-on-missing-mond-data"]