From 3cd78500ce4b9e35396ea86ff119d92c9caed23d Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 19 Oct 2021 10:01:44 -0400 Subject: [PATCH] Make client adaptive to receive global data When following, let the leader filter the relevant global data rather than the follower. --- confluent_server/confluent/collective/manager.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/confluent_server/confluent/collective/manager.py b/confluent_server/confluent/collective/manager.py index e2279f40..c25611bf 100644 --- a/confluent_server/confluent/collective/manager.py +++ b/confluent_server/confluent/collective/manager.py @@ -127,10 +127,7 @@ def connect_to_leader(cert=None, name=None, leader=None, remote=None): log.log({'info': 'Following leader {0}'.format(leader), 'subsystem': 'collective'}) colldata = tlvdata.recv(remote) - # the protocol transmits global data, but for now we ignore it globaldata = tlvdata.recv(remote) - if 'confluent_uuid' in globaldata: - cfm.set_global('confluent_uuid', globaldata['confluent_uuid']) dbi = tlvdata.recv(remote) dbsize = dbi['dbsize'] dbjson = b'' @@ -150,8 +147,8 @@ def connect_to_leader(cert=None, name=None, leader=None, remote=None): cfm._true_add_collective_member(c, colldata[c]['address'], colldata[c]['fingerprint'], sync=False) - #for globvar in globaldata: - # cfm.set_global(globvar, globaldata[globvar], False) + for globvar in globaldata: + cfm.set_global(globvar, globaldata[globvar], False) cfm._txcount = dbi.get('txcount', 0) cfm.ConfigManager(tenant=None)._load_from_json(dbjson, sync=False)