Commit fe8d2553 authored by Iustin Pop's avatar Iustin Pop
Browse files

Remove a superfluous warning in LUNodeRemove



Since we run the post-hooks explicitly in the Exec() function (via
_RunPostHook) after we removed the target node from the config, we
will get a:

  WARNING Node 'node2', which is about to be removed, was not found in
  the list of all nodes

in the logs every time we remove a node. The patch just removes the
warning, as actually invalid configurations (for the pre hook) will be
checked correctly elsewhere.

Additionally, the docstrings for BuildHooksEnv and BuildHooksNodes are
corrected/switched.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent b02c6bdf
......@@ -4849,9 +4849,6 @@ class LUNodeRemove(LogicalUnit):
def BuildHooksEnv(self):
"""Build hooks env.
 
This doesn't run on the target node in the pre phase as a failed
node would then be impossible to remove.
"""
return {
"OP_TARGET": self.op.node_name,
......@@ -4861,13 +4858,15 @@ class LUNodeRemove(LogicalUnit):
def BuildHooksNodes(self):
"""Build hooks nodes.
 
This doesn't run on the target node in the pre phase as a failed
node would then be impossible to remove.
"""
all_nodes = self.cfg.GetNodeList()
try:
all_nodes.remove(self.op.node_name)
except ValueError:
logging.warning("Node '%s', which is about to be removed, was not found"
" in the list of all nodes", self.op.node_name)
pass
return (all_nodes, all_nodes)
 
def CheckPrereq(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment