On Wed, Jun 17, 2015 at 07:11:11PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
Add a predicate telling if a list of nodes is globally N+1
redundant. It is, if each node is.
Signed-off-by: Klaus Aehlig <[email protected]>
---
src/Ganeti/HTools/GlobalN1.hs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/Ganeti/HTools/GlobalN1.hs b/src/Ganeti/HTools/GlobalN1.hs
index 051f918..e575788 100644
--- a/src/Ganeti/HTools/GlobalN1.hs
+++ b/src/Ganeti/HTools/GlobalN1.hs
@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
module Ganeti.HTools.GlobalN1
( canEvacuateNode
+ , redundant
, allocGlobalN1
) where
@@ -87,6 +88,10 @@ canEvacuateNode (nl, il) n = isOk $ do
$ Container.elems nl'
foldM_ (evac grp escapenodes) (nl',il') sharedIdxs
+-- | Predicate on wheter a given situation is gloabbly N+1 redundant.
s/gloabbly/globally/
+redundant :: Node.List -> Instance.List -> Bool
+redundant nl il = Foldable.all (canEvacuateNode (nl, il)) nl
+
-- | Predicate on wheter an allocation element leads to a globally N+1 redundant
-- state.
allocGlobalN1 :: Node.List -- ^ the original list of nodes
@@ -95,4 +100,4 @@ allocGlobalN1 :: Node.List -- ^ the original list of nodes
allocGlobalN1 nl il alloc =
let il' = AllocSol.updateIl il $ Just alloc
nl' = AllocSol.extractNl nl il $ Just alloc
- in Foldable.all (canEvacuateNode (nl', il')) nl'
+ in redundant nl' il'
--
2.4.3.573.g4eafbef
LGTM, no need to resend
