-#!/usr/bin/python
+#
#
# Copyright (C) 2006, 2007 Google Inc.
opcodes.OpVerifyCluster: cmdlib.LUVerifyCluster,
opcodes.OpMasterFailover: cmdlib.LUMasterFailover,
opcodes.OpDumpClusterConfig: cmdlib.LUDumpClusterConfig,
+ opcodes.OpRenameCluster: cmdlib.LURenameCluster,
# node lu
opcodes.OpAddNode: cmdlib.LUAddNode,
opcodes.OpQueryNodes: cmdlib.LUQueryNodes,
- opcodes.OpQueryNodeData: cmdlib.LUQueryNodeData,
opcodes.OpQueryNodeVolumes: cmdlib.LUQueryNodeVolumes,
opcodes.OpRemoveNode: cmdlib.LURemoveNode,
# instance lu
opcodes.OpCreateInstance: cmdlib.LUCreateInstance,
opcodes.OpReinstallInstance: cmdlib.LUReinstallInstance,
opcodes.OpRemoveInstance: cmdlib.LURemoveInstance,
+ opcodes.OpRenameInstance: cmdlib.LURenameInstance,
opcodes.OpActivateInstanceDisks: cmdlib.LUActivateInstanceDisks,
opcodes.OpShutdownInstance: cmdlib.LUShutdownInstance,
opcodes.OpStartupInstance: cmdlib.LUStartupInstance,
opcodes.OpExportInstance: cmdlib.LUExportInstance,
# tags lu
opcodes.OpGetTags: cmdlib.LUGetTags,
- opcodes.OpSetTag: cmdlib.LUAddTag,
- opcodes.OpDelTag: cmdlib.LUDelTag,
+ opcodes.OpAddTags: cmdlib.LUAddTags,
+ opcodes.OpDelTags: cmdlib.LUDelTags,
}
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)
+ hm = HooksMaster(rpc.call_hooks_runner, lu)
+ hm.RunPhase(constants.HOOKS_PHASE_PRE)
result = lu.Exec(feedback_fn)
- if do_hooks:
- hm.RunPhase(constants.HOOKS_PHASE_POST)
+ 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):
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, lu)
# hm.RunPhase(constants.HOOKS_PHASE_PRE)
result = lu.Exec(feedback_fn)
#if do_hooks:
which behaves the same works.
"""
- def __init__(self, callfn, cfg, sstore, lu):
+ def __init__(self, callfn, lu):
self.callfn = callfn
- self.cfg = cfg
- self.sstore = sstore
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}
"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.
"""
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:
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)