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

Move OSD stats uploading to primary only 

Instead of each node uploading its own OSD stats, which would not work
if the PVC daemon wasn't running, instead have the primary upload stats
for all OSDs in the cluster.
This commit is contained in:
Joshua Boniface 2020-12-09 02:46:09 -05:00
parent b36ec43a2d
commit 89c7e225a0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
node-daemon/pvcnoded/Daemon.py
View File

@ -1275,6 +1275,8 @@ def collect_ceph_stats(queue):
osd_stats = dict() osd_stats = dict()
for osd in osd_list: for osd in osd_list:
if d_osd[osd].node == myhostname:
osds_this_node += 1
try: try:
this_dump = osd_dump[osd] this_dump = osd_dump[osd]
this_dump.update(osd_df[osd]) this_dump.update(osd_df[osd])
@ -1284,12 +1286,12 @@ def collect_ceph_stats(queue):
# One or more of the status commands timed out, just continue # One or more of the status commands timed out, just continue
logger.out('Failed to parse OSD stats into dictionary: {}'.format(e), state='w') logger.out('Failed to parse OSD stats into dictionary: {}'.format(e), state='w')
# Trigger updates for each OSD on this node # Upload OSD data for the cluster (primary-only)
if this_node.router_state == 'primary':
if debug: if debug:
logger.out("Trigger updates for each OSD on this node", state='d', prefix='ceph-thread') logger.out("Trigger updates for each OSD", state='d', prefix='ceph-thread')
for osd in osd_list: for osd in osd_list:
if d_osd[osd].node == myhostname:
try: try:
stats = json.dumps(osd_stats[osd]) stats = json.dumps(osd_stats[osd])
zkhandler.writedata(zk_conn, { zkhandler.writedata(zk_conn, {
@ -1298,7 +1300,6 @@ def collect_ceph_stats(queue):
except KeyError as e: except KeyError as e:
# One or more of the status commands timed out, just continue # One or more of the status commands timed out, just continue
logger.out('Failed to upload OSD stats from dictionary: {}'.format(e), state='w') logger.out('Failed to upload OSD stats from dictionary: {}'.format(e), state='w')
osds_this_node += 1
ceph_conn.shutdown() ceph_conn.shutdown()