From 4422eb8941625c6fa54eb736522ac7ce77650243 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sat, 27 Oct 2018 18:04:55 -0400 Subject: [PATCH] Write Ceph status data to ZK --- node-daemon/pvcd/Daemon.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/node-daemon/pvcd/Daemon.py b/node-daemon/pvcd/Daemon.py index 0d6011df..322e170c 100644 --- a/node-daemon/pvcd/Daemon.py +++ b/node-daemon/pvcd/Daemon.py @@ -408,8 +408,9 @@ current_primary = zkhandler.readdata(zk_conn, '/primary_node') if current_primary and current_primary != 'none': logger.out('Current primary node is {}{}{}.'.format(logger.fmt_blue, current_primary, logger.fmt_end), state='i') else: - logger.out('No primary node found; creating with us as primary.', state='i') - zkhandler.writedata(zk_conn, { '/primary_node': myhostname }) + if config['daemon_mode'] == 'coordinator': + logger.out('No primary node found; creating with us as primary.', state='i') + zkhandler.writedata(zk_conn, { '/primary_node': myhostname }) ############################################################################### # PHASE 6 - Create local IP addresses for static networks @@ -698,6 +699,18 @@ def update_zookeeper(): if domain_uuid not in this_node.domain_list: this_node.domain_list.append(domain_uuid) + # Set ceph health information in zookeeper (primary only) + if this_node.router_state == 'primary': + retcode, stdout, stderr = common.run_os_command('ceph status') + ceph_status = stdout + try: + zkhandler.writedata(zk_conn, { + '/ceph': str(ceph_status) + }) + except: + logger.out('Failed to set Ceph status data', state='e') + return + # Set our information in zookeeper #this_node.name = lv_conn.getHostname() this_node.memused = int(psutil.virtual_memory().used / 1024 / 1024)