From 94bbfece16a507e71e19b734ddf5fcbf5671ba22 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 10 Sep 2008 17:06:50 +0000
Subject: [PATCH] Add ConfigWriter._UnlockedGetInstanceList/Info()

This patch splits the GetInstanceInfo and GetInstanceList methods into
two parts, one locked one _Unlocked similar to the way nodes are
queried.

Reviewed-by: ultrotter
---
 lib/config.py |   33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/config.py b/lib/config.py
index 510ddd4..f1c9bf2 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -410,6 +410,15 @@ class ConfigWriter:
     """
     self._SetInstanceStatus(instance_name, "down")
 
+  def _UnlockedGetInstanceList(self):
+    """Get the list of instances.
+
+    This function is for internal use, when the config lock is already held.
+
+    """
+    self._OpenConfig()
+    return self._config_data.instances.keys()
+
   @locking.ssynchronized(_config_lock, shared=1)
   def GetInstanceList(self):
     """Get the list of instances.
@@ -419,9 +428,7 @@ class ConfigWriter:
       these contains all the instances, also the ones in Admin_down state
 
     """
-    self._OpenConfig()
-
-    return self._config_data.instances.keys()
+    return self._UnlockedGetInstanceList()
 
   @locking.ssynchronized(_config_lock, shared=1)
   def ExpandInstanceName(self, short_name):
@@ -433,6 +440,19 @@ class ConfigWriter:
     return utils.MatchNameComponent(short_name,
                                     self._config_data.instances.keys())
 
+  def _UnlockedGetInstanceInfo(self, instance_name):
+    """Returns informations about an instance.
+
+    This function is for internal use, when the config lock is already held.
+
+    """
+    self._OpenConfig()
+
+    if instance_name not in self._config_data.instances:
+      return None
+
+    return self._config_data.instances[instance_name]
+
   @locking.ssynchronized(_config_lock, shared=1)
   def GetInstanceInfo(self, instance_name):
     """Returns informations about an instance.
@@ -447,12 +467,7 @@ class ConfigWriter:
       the instance object
 
     """
-    self._OpenConfig()
-
-    if instance_name not in self._config_data.instances:
-      return None
-
-    return self._config_data.instances[instance_name]
+    return self._UnlockedGetInstanceInfo(instance_name)
 
   @locking.ssynchronized(_config_lock)
   def AddNode(self, node):
-- 
1.7.10.4