xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-11 16:24:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix confluent uuid handling

Browse Source
This commit is contained in:
Jarrod Johnson 2021-10-19 10:37:08 -04:00
parent 3cd78500ce
commit f8f60052d0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -794,7 +794,7 @@ def commit_clear():
# currently just 'autosense' which is intended to be active
# per collective member
for globvar in _oldcfgstore.get('globals', ()):
if globvar.endswith('_key'):
if globvar.endswith('_key') or globvar == 'confluent_uuid':
continue
_cfgstore['globals'][globvar] = _oldcfgstore['globals'][globvar]
_oldcfgstore = None

2
confluent_server/confluent/discovery/protocols/ssdp.py
View File

@ -145,7 +145,6 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
net4.bind(('', 1900))
net6.bind(('', 1900))
peerbymacaddress = {}
myuuid = cfm.get_global('confluent_uuid')
while True:
try:
newmacs = set([])
@ -190,6 +189,7 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
for query in headline[-1].split('/'):
node = None
if query.startswith('confluentuuid='):
myuuid = cfm.get_global('confluent_uuid')
curruuid = query.split('=', 1)[1].lower()
if curruuid != myuuid:
break