diff --git a/lib/config.py b/lib/config.py index 52bfe0fe2ead5236f75d66d5605f6adaa174db35..c1030640ac8edaa06e9f44a0af95d9d1006f646a 100644 --- a/lib/config.py +++ b/lib/config.py @@ -48,7 +48,7 @@ from ganeti import serializer _config_lock = locking.SharedLock() # job id used for resource management at config upgrade time -_UPGRADE_CONFIG_JID="jid-cfg-upgrade" +_UPGRADE_CONFIG_JID = "jid-cfg-upgrade" def _ValidateConfig(data): @@ -200,6 +200,7 @@ class ConfigWriter: return self._temporary_secrets.Generate(self._AllDRBDSecrets(), utils.GenerateSecret, ec_id) + def _AllLVs(self): """Compute the list of all LVs. @@ -1002,7 +1003,6 @@ class ConfigWriter: return self._config_data.nodes[node_name] - @locking.ssynchronized(_config_lock, shared=1) def GetNodeInfo(self, node_name): """Get the configuration of a node, as stored in the config. @@ -1028,7 +1028,6 @@ class ConfigWriter: """ return self._config_data.nodes.keys() - @locking.ssynchronized(_config_lock, shared=1) def GetNodeList(self): """Return the list of nodes which are in the configuration. @@ -1195,7 +1194,6 @@ class ConfigWriter: # only called at config init time, without the lock held self.DropECReservations(_UPGRADE_CONFIG_JID) - def _DistributeConfig(self, feedback_fn): """Distribute the configuration to the other nodes.