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

Merge pull request #32 from jjohnson42/fixdeletenotification

Browse Source 
Correct behavior when a node is deleted
This commit is contained in:
Jarrod Johnson 2015-10-05 09:51:39 -04:00
commit 098c78558b
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,7 @@ import re
import string
import sys
import threading
import traceback
_masterkey = None
@ -990,7 +991,16 @@ class ConfigManager(object):
if node not in attribwatchers:
continue
attribwatcher = attribwatchers[node]
for attrname in nodeattrs[node].iterkeys():
# usually, we will only look at the specific attribute keys that
# have had change flagged, so set up to iterate through only those
checkattrs = nodeattrs[node]
if '_nodedeleted' in nodeattrs[node]:
# in the case of a deleted node, we want to iterate through
# *all* attributes that the node might have had set prior
# to deletion, to make all watchers aware of the removed
# node and take appropriate action
checkattrs = attribwatcher
for attrname in checkattrs:
if attrname not in attribwatcher:
continue
for notifierid in attribwatcher[attrname].iterkeys():
@ -1023,6 +1033,9 @@ class ConfigManager(object):
watcher(added=[], deleting=nodes, configmanager=self)
changeset = {}
for node in nodes:
# set a reserved attribute for the sake of the change notification
# framework to trigger on
changeset[node] = {'_nodedeleted': 1}
node = node.encode('utf-8')
if node in self._cfgstore['nodes']:
self._sync_groups_to_node(node=node, groups=[],