from ganeti import errors
from ganeti import rpc
from ganeti import cmdlib
-from ganeti import ssconf
from ganeti import logger
from ganeti import locking
opcodes.OpDestroyCluster: cmdlib.LUDestroyCluster,
opcodes.OpQueryClusterInfo: cmdlib.LUQueryClusterInfo,
opcodes.OpVerifyCluster: cmdlib.LUVerifyCluster,
- opcodes.OpDumpClusterConfig: cmdlib.LUDumpClusterConfig,
+ opcodes.OpQueryConfigValues: cmdlib.LUQueryConfigValues,
opcodes.OpRenameCluster: cmdlib.LURenameCluster,
opcodes.OpVerifyDisks: cmdlib.LUVerifyDisks,
opcodes.OpSetClusterParams: cmdlib.LUSetClusterParams,
self.context = context
self._feedback_fn = None
self.exclusive_BGL = False
+ self.rpc = rpc.RpcRunner(context.cfg)
def _ExecLU(self, lu):
"""Logical Unit execution sequence.
"""
write_count = self.context.cfg.write_count
lu.CheckPrereq()
- hm = HooksMaster(rpc.call_hooks_runner, self, lu)
+ hm = HooksMaster(self.rpc.call_hooks_runner, self, lu)
h_results = hm.RunPhase(constants.HOOKS_PHASE_PRE)
lu.HooksCallBack(constants.HOOKS_PHASE_PRE, h_results,
self._feedback_fn, None)
given LU and its opcodes.
"""
+ adding_locks = level in lu.add_locks
+ acquiring_locks = level in lu.needed_locks
if level not in locking.LEVELS:
+ if callable(self._run_notifier):
+ self._run_notifier()
result = self._ExecLU(lu)
- elif level in lu.needed_locks:
- # This gives a chance to LUs to make last-minute changes after acquiring
- # locks at any preceding level.
+ elif adding_locks and acquiring_locks:
+ # We could both acquire and add locks at the same level, but for now we
+ # don't need this, so we'll avoid the complicated code needed.
+ raise NotImplementedError(
+ "Can't declare locks to acquire when adding others")
+ elif adding_locks or acquiring_locks:
lu.DeclareLocks(level)
- needed_locks = lu.needed_locks[level]
share = lu.share_locks[level]
- # This is always safe to do, as we can't acquire more/less locks than
- # what was requested.
- lu.needed_locks[level] = self.context.glm.acquire(level,
- needed_locks,
- shared=share)
+ if acquiring_locks:
+ needed_locks = lu.needed_locks[level]
+ lu.acquired_locks[level] = self.context.glm.acquire(level,
+ needed_locks,
+ shared=share)
+ else: # adding_locks
+ add_locks = lu.add_locks[level]
+ lu.remove_locks[level] = add_locks
+ try:
+ self.context.glm.add(level, add_locks, acquired=1, shared=share)
+ except errors.LockError:
+ raise errors.OpPrereqError(
+ "Coudn't add locks (%s), probably because of a race condition"
+ " with another job, who added them first" % add_locks)
try:
- result = self._LockAndExecLU(lu, level + 1)
+ try:
+ if adding_locks:
+ lu.acquired_locks[level] = add_locks
+ result = self._LockAndExecLU(lu, level + 1)
+ finally:
+ if level in lu.remove_locks:
+ self.context.glm.remove(level, lu.remove_locks[level])
finally:
- if lu.needed_locks[level]:
+ if self.context.glm.is_owned(level):
self.context.glm.release(level)
else:
result = self._LockAndExecLU(lu, level + 1)
return result
- def ExecOpCode(self, op, feedback_fn):
+ def ExecOpCode(self, op, feedback_fn, run_notifier):
"""Execute an opcode.
- Args:
- op: the opcode to be executed
+ @type op: an OpCode instance
+ @param op: the opcode to be executed
+ @type feedback_fn: a function that takes a single argument
+ @param feedback_fn: this function will be used as feedback from the LU
+ code to the end-user
+ @type run_notifier: callable (no arguments) or None
+ @param run_notifier: this function (if callable) will be called when
+ we are about to call the lu's Exec() method, that
+ is, after we have aquired all locks
"""
if not isinstance(op, opcodes.OpCode):
" to ExecOpcode")
self._feedback_fn = feedback_fn
+ self._run_notifier = run_notifier
lu_class = self.DISPATCH_TABLE.get(op.__class__, None)
if lu_class is None:
raise errors.OpCodeUnknown("Unknown opcode")
- if lu_class.REQ_WSSTORE:
- sstore = ssconf.WritableSimpleStore()
- else:
- sstore = ssconf.SimpleStore()
-
# Acquire the Big Ganeti Lock exclusively if this LU requires it, and in a
# shared fashion otherwise (to prevent concurrent run with an exclusive LU.
self.context.glm.acquire(locking.LEVEL_CLUSTER, [locking.BGL],
shared=not lu_class.REQ_BGL)
try:
self.exclusive_BGL = lu_class.REQ_BGL
- lu = lu_class(self, op, self.context, sstore)
+ lu = lu_class(self, op, self.context, self.rpc)
lu.ExpandNames()
assert lu.needed_locks is not None, "needed_locks not set by LU"
result = self._LockAndExecLU(lu, locking.LEVEL_INSTANCE)
return result
- 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
-
- """
- if not isinstance(op, opcodes.OpCode):
- raise errors.ProgrammerError("Non-opcode instance passed"
- " to ExecOpcode")
-
- lu_class = self.DISPATCH_TABLE.get(op.__class__, None)
- if lu_class is None:
- raise errors.OpCodeUnknown("Unknown opcode")
-
- if lu_class.REQ_BGL and not self.exclusive_BGL:
- raise errors.ProgrammerError("LUs which require the BGL cannot"
- " be chained to granular ones.")
-
- assert lu_class.REQ_BGL, "ChainOpCode is still BGL-only"
-
- if lu_class.REQ_WSSTORE:
- sstore = ssconf.WritableSimpleStore()
- else:
- sstore = ssconf.SimpleStore()
-
- #do_hooks = lu_class.HPATH is not None
- lu = lu_class(self, op, self.context, sstore)
- lu.CheckPrereq()
- #if do_hooks:
- # hm = HooksMaster(rpc.call_hooks_runner, self, lu)
- # h_results = hm.RunPhase(constants.HOOKS_PHASE_PRE)
- # lu.HooksCallBack(constants.HOOKS_PHASE_PRE,
- # h_results, self._feedback_fn, None)
- result = lu.Exec(self._feedback_fn)
- #if do_hooks:
- # h_results = hm.RunPhase(constants.HOOKS_PHASE_POST)
- # result = lu.HooksCallBack(constants.HOOKS_PHASE_POST,
- # h_results, self._feedback_fn, result)
- return result
-
def LogStep(self, current, total, message):
"""Log a change in LU execution progress.
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()
+ if self.lu.cfg is not None:
+ env["GANETI_CLUSTER"] = self.lu.cfg.GetClusterName()
+ env["GANETI_MASTER"] = self.lu.cfg.GetMasterNode()
env = dict([(str(key), str(val)) for key, val in env.iteritems()])
"""
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()]
+ nodes = [self.lu.cfg.GetMasterNode()]
results = self._RunWrapper(nodes, hpath, phase)
projects / ganeti-local / blobdiff