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

Fix reuse of channel for receiving changes

Browse Source
This commit is contained in:
Jarrod Johnson 2018-05-08 13:35:30 -04:00
parent d11c716b6a
commit e5f553801b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
confluent_server/confluent/collective/manager.py
View File

@ -48,7 +48,8 @@ def connect_to_leader(cert=None, name=None):
raise Exception("Certificate mismatch in the collective")
tlvdata.recv(remote) # the banner
tlvdata.recv(remote) # authpassed... 0..
tlvdata.send(remote, {'collective': {'operation': 'connect', 'name': name}})
tlvdata.send(remote, {'collective': {'operation': 'connect',
'name': name}})
keydata = tlvdata.recv(remote)
colldata = tlvdata.recv(remote)
globaldata = tlvdata.recv(remote)

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

@ -416,8 +416,7 @@ def follow_channel(channel):
_txcount = rpc['txcount']
if 'xid' in rpc:
_pendingchangesets[rpc['xid']].send()
msg = channel.recv(8)
def add_collective_member(name, address, fingerprint):
try: