xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-29 12:27:40 +00:00
Code Issues Projects Releases Wiki Activity

Allow invite from non-leader role

Browse Source 
A non-leader transaction is modified such that the enroll node
can be connected to the leader and have validation.
This commit is contained in:
Jarrod Johnson 2018-07-09 16:40:43 -04:00
parent 67d6e9a6c7
commit 298e11f60f
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ def connect_to_collective(cert, member):
remote = ssl.wrap_socket(remote, cert_reqs=ssl.CERT_NONE, keyfile='/etc/confluent/privkey.pem',
certfile='/etc/confluent/srvcert.pem')
if cert:
fprint = util.get_fingerprint(cert)
fprint = cert
else:
collent = cfm.get_collective_member_by_address(member)
fprint = collent['fingerprint']
@ -176,12 +176,6 @@ def handle_connection(connection, cert, request, local=False):
tlvdata.send(connection, {'collective': {'leader': myleader}})
return
if 'invite' == operation:
if follower:
tlvdata.send(connection,
{'collective':
{'error': 'Invite can only be run from current '
'leader ({0})'.format(currentleader)}})
return
try:
cfm.check_quorum()
except exc.DegradedCollective:
@ -231,7 +225,7 @@ def handle_connection(connection, cert, request, local=False):
f = open('/etc/confluent/cfg/myname', 'w')
f.write(name)
f.close()
eventlet.spawn_n(connect_to_leader, cert, name)
eventlet.spawn_n(connect_to_leader, rsp['collective']['fingerprint'], name)
if 'enroll' == operation:
#TODO(jjohnson2): error appropriately when asked to enroll, but the master is elsewhere
mycert = util.get_certificate_from_file('/etc/confluent/srvcert.pem')
@ -249,8 +243,12 @@ def handle_connection(connection, cert, request, local=False):
connection.getsockname()[0], myfprint)
cfm.add_collective_member(request['name'],
connection.getpeername()[0], fprint)
myleader = get_leader(connection)
ldrfprint = cfm.get_collective_member_by_address(
myleader)['fingerprint']
tlvdata.send(connection,
{'collective': {'approval': myrsp,
'fingerprint': ldrfprint,
'leader': get_leader(connection)}})
if 'assimilate' == operation:
drone = request['name']

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

@ -525,7 +525,16 @@ def follow_channel(channel):
# mark the connection as broken
cfgleader = True
def add_collective_member(name, address, fingerprint):
if cfgleader:
return exec_on_leader('add_collective_member', name, address, fingerprint)
if cfgstreams:
exec_on_followers('_true_add_collective_member', name, address, fingerprint)
_true_add_collective_member(name, address, fingerprint)
def _true_add_collective_member(name, address, fingerprint):
try:
name = name.encode('utf-8')
except AttributeError: