From 4f807a57704754aea86da7dd6eff5ab817f91093 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 1 Sep 2010 18:31:54 +0200
Subject: [PATCH] Add new CLI options for min gain during balancing
Recent hbal seems to run many steps for small improvements (< 1e-3), so
we should stop early in this case.
We add a new option (-g), that will be used for the minimum gain during
balancing. This check will only become active when the cluster score is
below a threshold (--min-gain-limit), so as to not stop rebalances too
early.
---
Ganeti/HTools/CLI.hs | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/Ganeti/HTools/CLI.hs b/Ganeti/HTools/CLI.hs
index ff6904749..ab2095f19 100644
--- a/Ganeti/HTools/CLI.hs
+++ b/Ganeti/HTools/CLI.hs
@@ -49,6 +49,8 @@ module Ganeti.HTools.CLI
, oMaxCpu
, oMaxSolLength
, oMinDisk
+ , oMinGain
+ , oMinGainLim
, oMinScore
, oNoHeaders
, oNodeSim
@@ -100,6 +102,8 @@ data Options = Options
, optMaxLength :: Int -- ^ Stop after this many steps
, optMcpu :: Double -- ^ Max cpu ratio for nodes
, optMdsk :: Double -- ^ Max disk usage ratio for nodes
+ , optMinGain :: Score -- ^ Min gain we aim for in a step
+ , optMinGainLim :: Score -- ^ Limit below which we apply mingain
, optMinScore :: Score -- ^ The minimum score we aim for
, optNoHeaders :: Bool -- ^ Do not show a header line
, optNodeSim :: Maybe String -- ^ Cluster simulation mode
@@ -133,6 +137,8 @@ defaultOptions = Options
, optMaxLength = -1
, optMcpu = defVcpuRatio
, optMdsk = defReservedDiskRatio
+ , optMinGain = 1e-2
+ , optMinGainLim = 1e-1
, optMinScore = 1e-9
, optNoHeaders = False
, optNodeSim = Nothing
@@ -242,10 +248,20 @@ oMinDisk = Option "" ["min-disk"]
(ReqArg (\ n opts -> Ok opts { optMdsk = read n }) "RATIO")
"minimum free disk space for nodes (between 0 and 1) [0]"
+oMinGain :: OptType
+oMinGain = Option "g" ["min-gain"]
+ (ReqArg (\ g opts -> Ok opts { optMinGain = read g }) "DELTA")
+ "minimum gain to aim for in a balancing step before giving up"
+
+oMinGainLim :: OptType
+oMinGainLim = Option "" ["min-gain-limit"]
+ (ReqArg (\ g opts -> Ok opts { optMinGainLim = read g }) "SCORE")
+ "minimum cluster score for which we start checking the min-gain"
+
oMinScore :: OptType
oMinScore = Option "e" ["min-score"]
(ReqArg (\ e opts -> Ok opts { optMinScore = read e }) "EPSILON")
- " mininum score to aim for"
+ "mininum score to aim for"
oNoHeaders :: OptType
oNoHeaders = Option "" ["no-headers"]
--
GitLab