On Wed, Sep 23, 2015 at 02:14:38PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
For redundancy checks, ignore all nodes belonging to a group
marked as to be ignored. Do this ignoring in addition to already
existing node filtering.
Signed-off-by: Klaus Aehlig <[email protected]>
---
src/Ganeti/HTools/GlobalN1.hs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/Ganeti/HTools/GlobalN1.hs b/src/Ganeti/HTools/GlobalN1.hs
index 1ce0344..b88769d 100644
--- a/src/Ganeti/HTools/GlobalN1.hs
+++ b/src/Ganeti/HTools/GlobalN1.hs
@@ -118,7 +118,10 @@ redundant opts nl il =
let filterFun = if algAcceptExisting opts
then Container.filter (not . Node.offline)
else id
- in Foldable.all (canEvacuateNode (nl, il)) $ filterFun nl
+ in Foldable.all (canEvacuateNode (nl, il))
+ . Container.filter (not . (`elem` algCapacityIgnoreGroups opts)
+ . Node.group)
+ $ filterFun nl
-- | Predicate on wheter an allocation element leads to a globally N+1 redundant
-- state.
--
2.6.0.rc0.131.gf624c3d
LGTM
