parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 109 Wiki Activity

Fix shutdown secondary bug

This commit is contained in:
Joshua Boniface 2018-10-27 16:31:54 -04:00
parent d8796fd6d6
commit 0c67812fc2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
node-daemon/pvcd/Daemon.py
View File

@ -325,7 +325,7 @@ def cleanup():
logger.out('Terminating pvcd and cleaning up', state='s') logger.out('Terminating pvcd and cleaning up', state='s')
# Force into secondary network state if needed # Force into secondary network state if needed
if this_node.name == this_node.primary_node: if zkhandler.readdata(zk_conn, '/nodes/{}/routerstate'.format(myhostname)) == 'primary':
is_primary = True is_primary = True
zkhandler.writedata(zk_conn, { zkhandler.writedata(zk_conn, {
'/nodes/{}/routerstate'.format(myhostname): 'secondary', '/nodes/{}/routerstate'.format(myhostname): 'secondary',
@ -577,6 +577,9 @@ def update_primart(new_primary, stat, event=''):
zkhandler.writedata(zk_conn, {'/nodes/{}/routerstate'.format(myhostname): 'primary'}) zkhandler.writedata(zk_conn, {'/nodes/{}/routerstate'.format(myhostname): 'primary'})
else: else:
zkhandler.writedata(zk_conn, {'/nodes/{}/routerstate'.format(myhostname): 'secondary'}) zkhandler.writedata(zk_conn, {'/nodes/{}/routerstate'.format(myhostname): 'secondary'})
else:
zkhandler.writedata(zk_conn, {'/nodes/{}/routerstate'.format(myhostname): 'client'})
for node in d_node: for node in d_node:
d_node[node].primary_node = new_primary d_node[node].primary_node = new_primary