From f6d0e89568242e7fedeb520f4c46725e1cdd5ba1 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 31 May 2021 19:26:27 -0400 Subject: [PATCH] Properly add absent node type --- node-daemon/pvcnoded/Daemon.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/node-daemon/pvcnoded/Daemon.py b/node-daemon/pvcnoded/Daemon.py index eed60677..36af6c0c 100644 --- a/node-daemon/pvcnoded/Daemon.py +++ b/node-daemon/pvcnoded/Daemon.py @@ -626,12 +626,12 @@ signal.signal(signal.SIGHUP, hup) ############################################################################### # Check if our node exists in Zookeeper, and create it if not +if config['daemon_mode'] == 'coordinator': + init_routerstate = 'secondary' +else: + init_routerstate = 'client' if zkhandler.exists('/nodes/{}'.format(myhostname)): logger.out("Node is " + fmt_green + "present" + fmt_end + " in Zookeeper", state='i') - if config['daemon_mode'] == 'coordinator': - init_routerstate = 'secondary' - else: - init_routerstate = 'client' # Update static data just in case it's changed zkhandler.write([ ('/nodes/{}/daemonmode'.format(myhostname), config['daemon_mode']), @@ -651,7 +651,7 @@ else: # Basic state information ('/nodes/{}/daemonmode'.format(myhostname), config['daemon_mode']), ('/nodes/{}/daemonstate'.format(myhostname), 'init'), - ('/nodes/{}/routerstate'.format(myhostname), 'client'), + ('/nodes/{}/routerstate'.format(myhostname), init_routerstate), ('/nodes/{}/domainstate'.format(myhostname), 'flushed'), ('/nodes/{}/staticdata'.format(myhostname), ' '.join(staticdata)), ('/nodes/{}/memtotal'.format(myhostname), '0'),