xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-23 10:02:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix rollback

Browse Source 
The fix for the stale data introduced breaking clear rollback
Restore the behavior and make self._cfgstore a somewhat slower property
for now.
This commit is contained in:
Jarrod Johnson 2018-10-10 15:22:20 -04:00
parent 6a784e3a1c
commit 6b70a4322a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
confluent_server/confluent/config/configmanager.py
View File

@ -638,10 +638,7 @@ def clear_configuration():
stop_following()
_oldcfgstore = _cfgstore
_oldtxcount = _txcount
if _cfgstore is None or 'main' not in _cfgstore:
_cfgstore = {}
else:
_cfgstore['main'].clear()
_cfgstore = {}
_txcount = 0
def commit_clear():
@ -955,6 +952,12 @@ class ConfigManager(object):
_nodecollwatchers = {}
_notifierids = {}
@property
def _cfgstore(self):
if self.tenant is None:
return _cfgstore['main']
return _cfgstore['tenant'][self.tenant]
def __init__(self, tenant, decrypt=False, username=None):
global _cfgstore
with _initlock:
@ -967,7 +970,6 @@ class ConfigManager(object):
if 'main' not in _cfgstore:
_cfgstore['main'] = {}
self._bg_sync_to_file()
self._cfgstore = _cfgstore['main']
if 'nodegroups' not in self._cfgstore: # This can happen during a clear... it seams... and if so it messes up...
self._cfgstore['nodegroups'] = {'everything': {'nodes': set()}}
_mark_dirtykey('nodegroups', 'everything', self.tenant)
@ -983,7 +985,6 @@ class ConfigManager(object):
_cfgstore['tenant'][tenant] = {}
self._bg_sync_to_file()
self.tenant = tenant
self._cfgstore = _cfgstore['tenant'][tenant]
if 'nodegroups' not in self._cfgstore:
self._cfgstore['nodegroups'] = {'everything': {}}
_mark_dirtykey('nodegroups', 'everything', self.tenant)