X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/b31c867624dbd02a5ddb86daaa166b9cb581f110..da961187f97344fde390140ebb2f10d10d334d51:/lib/mcpu.py diff --git a/lib/mcpu.py b/lib/mcpu.py index fc9fcf3..2512762 100644 --- a/lib/mcpu.py +++ b/lib/mcpu.py @@ -49,6 +49,7 @@ class Processor(object): opcodes.OpRenameCluster: cmdlib.LURenameCluster, opcodes.OpVerifyDisks: cmdlib.LUVerifyDisks, opcodes.OpSetClusterParams: cmdlib.LUSetClusterParams, + opcodes.OpRedistributeConfig: cmdlib.LURedistributeConfig, # node lu opcodes.OpAddNode: cmdlib.LUAddNode, opcodes.OpQueryNodes: cmdlib.LUQueryNodes, @@ -67,6 +68,7 @@ class Processor(object): opcodes.OpDeactivateInstanceDisks: cmdlib.LUDeactivateInstanceDisks, opcodes.OpReplaceDisks: cmdlib.LUReplaceDisks, opcodes.OpFailoverInstance: cmdlib.LUFailoverInstance, + opcodes.OpMigrateInstance: cmdlib.LUMigrateInstance, opcodes.OpConnectConsole: cmdlib.LUConnectConsole, opcodes.OpQueryInstances: cmdlib.LUQueryInstances, opcodes.OpQueryInstanceData: cmdlib.LUQueryInstanceData, @@ -337,12 +339,13 @@ class HooksMaster(object): raise errors.HooksFailure("Communication failure") for node_name in results: res = results[node_name] - if res is False or not isinstance(res, list): - self.proc.LogWarning("Communication failure to node %s" % node_name) + if res.failed or res.data is False or not isinstance(res.data, list): + if not res.offline: + self.proc.LogWarning("Communication failure to node %s" % + node_name) continue - for script, hkr, output in res: + for script, hkr, output in res.data: if hkr == constants.HKR_FAIL: - output = output.strip().encode("string_escape") errs.append((node_name, script, output)) if errs: raise errors.HooksAbort(errs)