xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-12-25 12:41:39 +00:00
Code Issues Projects Releases Wiki Activity

Make orphaned sync runner retire on new sync request

Browse Source
This commit is contained in:
Jarrod Johnson 2024-04-10 13:54:06 -04:00
parent ceaf641c1a
commit 8e5ee6c9d8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
confluent_server/confluent/syncfiles.py
View File

@ -290,8 +290,6 @@ cleaner = None
def start_syncfiles(nodename, cfg, suffixes, principals=[]):
global cleaner
peerip = None
if nodename in syncrunners:
return '503 Synchronization already in progress', 'Synchronization already in progress for {}'.format(nodename)
if 'myips' in suffixes:
targips = suffixes['myips']
del suffixes['myips']
@ -318,6 +316,11 @@ def start_syncfiles(nodename, cfg, suffixes, principals=[]):
sl = SyncList(synclist, nodename, cfg)
if not (sl.appendmap or sl.mergemap or sl.replacemap or sl.appendoncemap):
return '200 OK', 'Empty synclist' # the synclist has no actual entries
if nodename in syncrunners:
if syncrunners[nodename].dead:
syncrunners[nodename].wait()
else:
return '503 Synchronization already in progress', 'Synchronization already in progress for {}'.format(nodename)
syncrunners[nodename] = eventlet.spawn(
sync_list_to_node, sl, nodename, suffixes, peerip)
if not cleaner: