From e85d8982477abfc025edb9f7f40f343afa9e89be Mon Sep 17 00:00:00 2001
From: Stephen Shirley <diamond@google.com>
Date: Mon, 31 Jan 2011 17:00:03 +0100
Subject: [PATCH] Add _UnlockedLookupNodeGroup()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This allows calling of _UnlockedLookupNodeGroup() from within
AddNodeGroup()
Signed-off-by: Stephen Shirley <diamond@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/config.py | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/lib/config.py b/lib/config.py
index 3234ee174..a639fd878 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -969,8 +969,7 @@ class ConfigWriter:
self._config_data.cluster.serial_no += 1
self._WriteConfig()
- @locking.ssynchronized(_config_lock, shared=1)
- def LookupNodeGroup(self, target):
+ def _UnlockedLookupNodeGroup(self, target):
"""Lookup a node group's UUID.
@type target: string or None
@@ -994,6 +993,20 @@ class ConfigWriter:
raise errors.OpPrereqError("Node group '%s' not found" % target,
errors.ECODE_NOENT)
+ @locking.ssynchronized(_config_lock, shared=1)
+ def LookupNodeGroup(self, target):
+ """Lookup a node group's UUID.
+
+ This function is just a wrapper over L{_UnlockedLookupNodeGroup}.
+
+ @type target: string or None
+ @param target: group name or UUID or None to look for the default
+ @rtype: string
+ @return: nodegroup UUID
+
+ """
+ return self._UnlockedLookupNodeGroup(target)
+
def _UnlockedGetNodeGroup(self, uuid):
"""Lookup a node group.
--
GitLab