From 6a752efca20152b41af6a095c61f664040a29484 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 3 Nov 2011 16:58:00 +0100
Subject: [PATCH] Use node resource lock when recreating instance disks
Recreating disks conflicts with other disk operations, therefore the
node resource lock must be acquired.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 8c302eccb..d1fe08454 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6456,6 +6456,10 @@ class LUInstanceRecreateDisks(LogicalUnit):
# otherwise we need to lock all nodes for disk re-creation
primary_only = bool(self.op.nodes)
self._LockInstancesNodes(primary_only=primary_only)
+ elif level == locking.LEVEL_NODE_RES:
+ # Copy node locks
+ self.needed_locks[locking.LEVEL_NODE_RES] = \
+ self.needed_locks[locking.LEVEL_NODE][:]
def BuildHooksEnv(self):
"""Build hooks env.
@@ -6502,7 +6506,8 @@ class LUInstanceRecreateDisks(LogicalUnit):
self.op.instance_name, errors.ECODE_INVAL)
# if we replace nodes *and* the old primary is offline, we don't
# check
- assert instance.primary_node in self.needed_locks[locking.LEVEL_NODE]
+ assert instance.primary_node in self.owned_locks(locking.LEVEL_NODE)
+ assert instance.primary_node in self.owned_locks(locking.LEVEL_NODE_RES)
old_pnode = self.cfg.GetNodeInfo(instance.primary_node)
if not (self.op.nodes and old_pnode.offline):
_CheckInstanceDown(self, instance, "cannot recreate disks")
@@ -6526,6 +6531,9 @@ class LUInstanceRecreateDisks(LogicalUnit):
"""
instance = self.instance
+ assert (self.owned_locks(locking.LEVEL_NODE) ==
+ self.owned_locks(locking.LEVEL_NODE_RES))
+
to_skip = []
mods = [] # keeps track of needed logical_id changes
--
GitLab