X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/f27302fafc3e4d65f7dd44f551ded242629d9ade..de47cf8ff14cf9ad034c7be97ab8feb2a427f52a:/lib/mcpu.py?ds=sidebyside diff --git a/lib/mcpu.py b/lib/mcpu.py index 1f46dbb..4ba5926 100644 --- a/lib/mcpu.py +++ b/lib/mcpu.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +# # # Copyright (C) 2006, 2007 Google Inc. @@ -36,6 +36,7 @@ from ganeti import rpc from ganeti import cmdlib from ganeti import config from ganeti import ssconf +from ganeti import logger class Processor(object): """Object which runs OpCodes""" @@ -50,6 +51,7 @@ class Processor(object): opcodes.OpMasterFailover: cmdlib.LUMasterFailover, opcodes.OpDumpClusterConfig: cmdlib.LUDumpClusterConfig, opcodes.OpRenameCluster: cmdlib.LURenameCluster, + opcodes.OpVerifyDisks: cmdlib.LUVerifyDisks, # node lu opcodes.OpAddNode: cmdlib.LUAddNode, opcodes.OpQueryNodes: cmdlib.LUQueryNodes, @@ -63,6 +65,7 @@ class Processor(object): opcodes.OpActivateInstanceDisks: cmdlib.LUActivateInstanceDisks, opcodes.OpShutdownInstance: cmdlib.LUShutdownInstance, opcodes.OpStartupInstance: cmdlib.LUStartupInstance, + opcodes.OpRebootInstance: cmdlib.LURebootInstance, opcodes.OpDeactivateInstanceDisks: cmdlib.LUDeactivateInstanceDisks, opcodes.OpAddMDDRBDComponent: cmdlib.LUAddMDDRBDComponent, opcodes.OpRemoveMDDRBDComponent: cmdlib.LURemoveMDDRBDComponent, @@ -79,26 +82,28 @@ class Processor(object): opcodes.OpExportInstance: cmdlib.LUExportInstance, # tags lu opcodes.OpGetTags: cmdlib.LUGetTags, + opcodes.OpSearchTags: cmdlib.LUSearchTags, opcodes.OpAddTags: cmdlib.LUAddTags, opcodes.OpDelTags: cmdlib.LUDelTags, } - - def __init__(self): + def __init__(self, feedback=None): """Constructor for Processor + Args: + - feedback_fn: the feedback function (taking one string) to be run when + interesting events are happening """ self.cfg = None self.sstore = None + self._feedback_fn = feedback - def ExecOpCode(self, op, feedback_fn): + def ExecOpCode(self, op): """Execute an opcode. Args: - cfg: the configuration in which we execute this opcode - opcode: the opcode to be executed - - feedback_fn: the feedback function (taking one string) to be run when - interesting events are happening """ if not isinstance(op, opcodes.OpCode): @@ -112,26 +117,32 @@ class Processor(object): if lu_class.REQ_CLUSTER and self.cfg is None: self.cfg = config.ConfigWriter() self.sstore = ssconf.SimpleStore() + if self.cfg is not None: + write_count = self.cfg.write_count + else: + write_count = 0 lu = lu_class(self, op, self.cfg, self.sstore) lu.CheckPrereq() - do_hooks = lu_class.HPATH is not None - if do_hooks: - hm = HooksMaster(rpc.call_hooks_runner, self.cfg, self.sstore, lu) - hm.RunPhase(constants.HOOKS_PHASE_PRE) - result = lu.Exec(feedback_fn) - if do_hooks: - hm.RunPhase(constants.HOOKS_PHASE_POST) + hm = HooksMaster(rpc.call_hooks_runner, self, lu) + hm.RunPhase(constants.HOOKS_PHASE_PRE) + result = lu.Exec(self._feedback_fn) + hm.RunPhase(constants.HOOKS_PHASE_POST) + if lu.cfg is not None: + # we use lu.cfg and not self.cfg as for init cluster, self.cfg + # is None but lu.cfg has been recently initialized in the + # lu.Exec method + if write_count != lu.cfg.write_count: + hm.RunConfigUpdate() + return result - def ChainOpCode(self, op, feedback_fn): + def ChainOpCode(self, op): """Chain and execute an opcode. This is used by LUs when they need to execute a child LU. Args: - opcode: the opcode to be executed - - feedback_fn: the feedback function (taking one string) to be run when - interesting events are happening """ if not isinstance(op, opcodes.OpCode): @@ -145,17 +156,40 @@ class Processor(object): if lu_class.REQ_CLUSTER and self.cfg is None: self.cfg = config.ConfigWriter() self.sstore = ssconf.SimpleStore() - do_hooks = lu_class.HPATH is not None + #do_hooks = lu_class.HPATH is not None lu = lu_class(self, op, self.cfg, self.sstore) lu.CheckPrereq() #if do_hooks: - # hm = HooksMaster(rpc.call_hooks_runner, self.cfg, self.sstore, lu) + # hm = HooksMaster(rpc.call_hooks_runner, self, lu) # hm.RunPhase(constants.HOOKS_PHASE_PRE) - result = lu.Exec(feedback_fn) + result = lu.Exec(self._feedback_fn) #if do_hooks: # hm.RunPhase(constants.HOOKS_PHASE_POST) return result + def LogStep(self, current, total, message): + """Log a change in LU execution progress. + + """ + logger.Debug("Step %d/%d %s" % (current, total, message)) + self._feedback_fn("STEP %d/%d %s" % (current, total, message)) + + def LogWarning(self, message, hint=None): + """Log a warning to the logs and the user. + + """ + logger.Error(message) + self._feedback_fn(" - WARNING: %s" % message) + if hint: + self._feedback_fn(" Hint: %s" % hint) + + def LogInfo(self, message): + """Log an informational message to the logs and the user. + + """ + logger.Info(message) + self._feedback_fn(" - INFO: %s" % message) + class HooksMaster(object): """Hooks master. @@ -169,15 +203,12 @@ class HooksMaster(object): which behaves the same works. """ - def __init__(self, callfn, cfg, sstore, lu): + def __init__(self, callfn, proc, lu): self.callfn = callfn - self.cfg = cfg - self.sstore = sstore + self.proc = proc self.lu = lu self.op = lu.op - self.hpath = self.lu.HPATH self.env, node_list_pre, node_list_post = self._BuildEnv() - self.node_list = {constants.HOOKS_PHASE_PRE: node_list_pre, constants.HOOKS_PHASE_POST: node_list_post} @@ -193,22 +224,35 @@ class HooksMaster(object): "GANETI_HOOKS_VERSION": constants.HOOKS_VERSION, "GANETI_OP_CODE": self.op.OP_ID, "GANETI_OBJECT_TYPE": self.lu.HTYPE, + "GANETI_DATA_DIR": constants.DATA_DIR, } - lu_env, lu_nodes_pre, lu_nodes_post = self.lu.BuildHooksEnv() - if lu_env: - for key in lu_env: - env["GANETI_" + key] = lu_env[key] + if self.lu.HPATH is not None: + lu_env, lu_nodes_pre, lu_nodes_post = self.lu.BuildHooksEnv() + if lu_env: + for key in lu_env: + env["GANETI_" + key] = lu_env[key] + else: + lu_nodes_pre = lu_nodes_post = [] - if self.sstore is not None: - env["GANETI_CLUSTER"] = self.sstore.GetClusterName() - env["GANETI_MASTER"] = self.sstore.GetMasterNode() + return env, frozenset(lu_nodes_pre), frozenset(lu_nodes_post) - for key in env: - if not isinstance(env[key], str): - env[key] = str(env[key]) + def _RunWrapper(self, node_list, hpath, phase): + """Simple wrapper over self.callfn. - return env, frozenset(lu_nodes_pre), frozenset(lu_nodes_post) + This method fixes the environment before doing the rpc call. + + """ + env = self.env.copy() + env["GANETI_HOOKS_PHASE"] = phase + env["GANETI_HOOKS_PATH"] = hpath + if self.lu.sstore is not None: + env["GANETI_CLUSTER"] = self.lu.sstore.GetClusterName() + env["GANETI_MASTER"] = self.lu.sstore.GetMasterNode() + + env = dict([(str(key), str(val)) for key, val in env.iteritems()]) + + return self.callfn(node_list, hpath, phase, env) def RunPhase(self, phase): """Run all the scripts for a phase. @@ -217,12 +261,12 @@ class HooksMaster(object): """ if not self.node_list[phase]: - # empty node list, we should not attempt to run this - # as most probably we're in the cluster init phase and the rpc client - # part can't even attempt to run + # empty node list, we should not attempt to run this as either + # we're in the cluster init phase and the rpc client part can't + # even attempt to run, or this LU doesn't do hooks at all return - self.env["GANETI_HOOKS_PHASE"] = str(phase) - results = self.callfn(self.node_list[phase], self.hpath, phase, self.env) + hpath = self.lu.HPATH + results = self._RunWrapper(self.node_list[phase], hpath, phase) if phase == constants.HOOKS_PHASE_PRE: errs = [] if not results: @@ -230,11 +274,25 @@ class HooksMaster(object): for node_name in results: res = results[node_name] if res is False or not isinstance(res, list): - raise errors.HooksFailure("Communication failure to node %s" % - node_name) + self.proc.LogWarning("Communication failure to node %s" % node_name) + continue for script, hkr, output in res: if hkr == constants.HKR_FAIL: output = output.strip().encode("string_escape") errs.append((node_name, script, output)) if errs: raise errors.HooksAbort(errs) + + def RunConfigUpdate(self): + """Run the special configuration update hook + + This is a special hook that runs only on the master after each + top-level LI if the configuration has been updated. + + """ + phase = constants.HOOKS_PHASE_POST + hpath = constants.HOOKS_NAME_CFGUPDATE + if self.lu.sstore is None: + raise errors.ProgrammerError("Null sstore on config update hook") + nodes = [self.lu.sstore.GetMasterNode()] + results = self._RunWrapper(nodes, hpath, phase)