From 084565acfbf067ef8317352816e23f25048d92e6 Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Mon, 20 Feb 2012 13:14:27 +0100 Subject: [PATCH] Use the spindles metric in cluster scores MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes balancing use the new metric. Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: RenΓ© Nussbaumer <rn@google.com> --- htools/Ganeti/HTools/Cluster.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htools/Ganeti/HTools/Cluster.hs b/htools/Ganeti/HTools/Cluster.hs index cb49ffc6a..3ed871daa 100644 --- a/htools/Ganeti/HTools/Cluster.hs +++ b/htools/Ganeti/HTools/Cluster.hs @@ -305,6 +305,7 @@ detailedCVInfo = [ (1, "free_mem_cv") , (1, "disk_load_cv") , (1, "net_load_cv") , (2, "pri_tags_score") + , (1, "spindles_cv") ] -- | Holds the weights used by 'compCVNodes' for each metric. @@ -349,9 +350,11 @@ compDetailedCV all_nodes = -- metric: conflicting instance count pri_tags_inst = sum $ map Node.conflictingPrimaries nodes pri_tags_score = fromIntegral pri_tags_inst::Double + -- metric: spindles % + spindles_cv = map (\n -> Node.instSpindles n / Node.hiSpindles n) nodes in [ mem_cv, dsk_cv, n1_score, res_cv, off_score, off_pri_score, cpu_cv , stdDev c_load, stdDev m_load , stdDev d_load, stdDev n_load - , pri_tags_score ] + , pri_tags_score, stdDev spindles_cv ] -- | Compute the /total/ variance. compCVNodes :: [Node.Node] -> Double -- GitLab