From 4ca520463dfc6ee68bf43a786e80427a027d0e67 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 28 Oct 2010 13:57:28 +0200
Subject: [PATCH] Yet another rework in LUSetNodeParms
We will need the new role in CheckPrereq, so move its computation there
and save the new role to self.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/cmdlib.py | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 8f6b53c09..24cc95a12 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4068,7 +4068,7 @@ class LUSetNodeParams(LogicalUnit):
self.old_flags = old_flags = (node.master_candidate,
node.drained, node.offline)
assert old_flags in self._F2R, "Un-handled old flags %s" % str(old_flags)
- self.old_role = self._F2R[old_flags]
+ self.old_role = old_role = self._F2R[old_flags]
# Check for ineffective changes
for attr in self._FLAGS:
@@ -4091,16 +4091,8 @@ class LUSetNodeParams(LogicalUnit):
self.LogInfo("Demoting from master candidate")
self.op.master_candidate = False
- def Exec(self, feedback_fn):
- """Modifies a node.
-
- """
- node = self.node
- old_role = self.old_role
-
+ # Compute new role
assert [getattr(self.op, attr) for attr in self._FLAGS].count(True) <= 1
-
- # compute new flags
if self.op.master_candidate:
new_role = self._ROLE_CANDIDATE
elif self.op.drained:
@@ -4114,6 +4106,16 @@ class LUSetNodeParams(LogicalUnit):
else: # no new flags, nothing, keep old role
new_role = old_role
+ self.new_role = new_role
+
+ def Exec(self, feedback_fn):
+ """Modifies a node.
+
+ """
+ node = self.node
+ old_role = self.old_role
+ new_role = self.new_role
+
result = []
for attr in ["master_capable", "vm_capable"]:
--
GitLab