From 7073b3a86856bcd8d8a62c0b72f82deaabb8d8f1 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 14 Sep 2011 12:44:18 +0200
Subject: [PATCH] hail: don't select the primary as new secondary
This just adds the primary node of the instance as 'non-allocable'
during the choosing of the new secondary.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
htools/Ganeti/HTools/Cluster.hs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/htools/Ganeti/HTools/Cluster.hs b/htools/Ganeti/HTools/Cluster.hs
index 9e9469366..27017b25d 100644
--- a/htools/Ganeti/HTools/Cluster.hs
+++ b/htools/Ganeti/HTools/Cluster.hs
@@ -1107,10 +1107,11 @@ tryNodeEvac _ ini_nl ini_il mode idxs =
splitCluster ini_nl ini_il
(fin_nl, fin_il, esol) =
foldl' (\state@(nl, il, _) inst ->
- let gdx = instancePriGroup nl inst in
+ let gdx = instancePriGroup nl inst
+ pdx = Instance.pNode inst in
updateEvacSolution state (Instance.idx inst) $
availableGroupNodes group_ndx
- excl_ndx gdx >>=
+ (IntSet.insert pdx excl_ndx) gdx >>=
nodeEvacInstance nl il mode inst gdx
)
(ini_nl, ini_il, emptyEvacSolution)
--
GitLab