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

Actually execute replicate-on-connect

Browse Source 
This creates a duplicate of the leader.
This commit is contained in:
Jarrod Johnson 2018-05-03 14:03:56 -04:00
parent ecfb4d68c5
commit ecfc56efde
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,12 @@ def connect_to_leader(cert=None, name=None):
if not ndata:
raise Exception("Error doing initial DB transfer")
dbjson += ndata
cfm._restore_keys(keydata, None)
cfm._cfgstore['collective'] = colldata
for globvar in globaldata:
cfm.set_global(globvar, globaldata[globvar])
cfm.ConfigManager(tenant=None)._load_from_json(dbjson)
cfm.ConfigManager._bg_sync_to_file()
def handle_connection(connection, cert, request, local=False):

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

@ -353,6 +353,13 @@ def set_global(globalname, value):
"""
if _cfgstore is None:
init()
try:
globalname = globalname.encode('utf-8')
except AttributeError:
# We have to remove the unicode-ness of the string,
# but if it is already bytes in python 3, then we will
# get an attributeerror, so pass
pass
with _dirtylock:
if 'dirtyglobals' not in _cfgstore:
_cfgstore['dirtyglobals'] = set()
@ -1684,7 +1691,10 @@ def _restore_keys(jsond, password, newpassword=None):
# the file, and newpassword to use, (also check the service.cfg file)
global _masterkey
global _masterintegritykey
keydata = json.loads(jsond)
if isinstance(jsond, dict):
keydata = jsond
else:
keydata = json.loads(jsond)
cryptkey = _parse_key(keydata['cryptkey'], password)
integritykey = _parse_key(keydata['integritykey'], password)
conf.init_config()
@ -1745,6 +1755,7 @@ def restore_db_from_directory(location, password):
raise
try:
collective = json.load(open(os.path.join(location, 'collective.json')))
_cfgstore['collective'] = {}
for coll in collective:
add_collective_member(coll, collective[coll]['address'],
collective[coll]['fingerprint'])