xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-09 21:15:53 +00:00
Code Issues Projects Releases Wiki Activity

Carry txcount through connect replica

Browse Source 
The txcount was not up to date when offline updates occurred.
This commit is contained in:
Jarrod Johnson 2018-06-28 13:54:31 -04:00
parent f01c7e19f7
commit 8e77466875
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/collective/manager.py
View File

@ -70,7 +70,8 @@ def connect_to_leader(cert=None, name=None, leader=None):
follower = None
colldata = tlvdata.recv(remote)
globaldata = tlvdata.recv(remote)
dbsize = tlvdata.recv(remote)['dbsize']
dbi = tlvdata.recv(remote)
dbsize = dbi['dbsize']
dbjson = ''
while (len(dbjson) < dbsize):
ndata = remote.recv(dbsize - len(dbjson))
@ -88,6 +89,7 @@ def connect_to_leader(cert=None, name=None, leader=None):
for globvar in globaldata:
cfm.set_global(globvar, globaldata[globvar])
cfm.ConfigManager(tenant=None)._load_from_json(dbjson)
cfm._txcount = dbix['txcount']
cfm.ConfigManager._bg_sync_to_file()
currentleader = leader
#spawn this as a thread...
@ -265,7 +267,8 @@ def handle_connection(connection, cert, request, local=False):
tlvdata.send(connection, cfm._cfgstore['collective'])
tlvdata.send(connection, cfm.get_globals())
cfgdata = cfm.ConfigManager(None)._dump_to_json()
tlvdata.send(connection, {'dbsize': len(cfgdata)})
tlvdata.send(connection, {'txcount': cfm._txcount,
'dbsize': len(cfgdata)})
connection.sendall(cfgdata)
#tlvdata.send(connection, {'tenants': 0}) # skip the tenants for now,
# so far unused anyway