From d4e4b2fd7ef05a3b89849e216a1a04c1d50e2446 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 17 Dec 2012 14:41:11 +0100
Subject: [PATCH] LUOobCommand: Always declare NAL in shared mode
Doing so avoids triggering an assertion in mcpu which cross-checks the
node lock and node allocation lock acquisition mode.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 0fbdb0694..d84e41f8d 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4814,10 +4814,11 @@ class LUOobCommand(NoHooksLU):
locking.LEVEL_NODE: lock_names,
}
+ self.share_locks[locking.LEVEL_NODE_ALLOC] = 1
+
if not self.op.node_names:
# Acquire node allocation lock only if all nodes are affected
self.needed_locks[locking.LEVEL_NODE_ALLOC] = locking.ALL_SET
- self.share_locks[locking.LEVEL_NODE_ALLOC] = 1
def CheckPrereq(self):
"""Check prerequisites.
--
GitLab