Commit d9f99d88 authored by Guido Trotter's avatar Guido Trotter
Browse files

Remove references to acquired_locks



These sneaked in from 2.4 during the merge, but this attribute is
actually gone in the master branch.
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 93384b8c
......@@ -11004,12 +11004,12 @@ class LUGroupAssignNodes(NoHooksLU):
"""
assert self.needed_locks[locking.LEVEL_NODEGROUP]
assert (frozenset(self.acquired_locks[locking.LEVEL_NODE]) ==
assert (frozenset(self.glm.list_owned(locking.LEVEL_NODE)) ==
frozenset(self.op.nodes))
expected_locks = (set([self.group_uuid]) |
self.cfg.GetNodeGroupsFromNodes(self.op.nodes))
actual_locks = self.acquired_locks[locking.LEVEL_NODEGROUP]
actual_locks = self.glm.list_owned(locking.LEVEL_NODEGROUP)
if actual_locks != expected_locks:
raise errors.OpExecError("Nodes changed groups since locks were acquired,"
" current groups are '%s', used to be '%s'" %
......
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