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

Ensure stdout is used

This commit is contained in:
Joshua Boniface 2020-01-06 12:34:35 -05:00
parent 9ea86cc570
commit 094ac8c3a8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1139,7 +1139,7 @@ def update_zookeeper():
retcode, stdout, stderr = common.run_os_command('ceph osd status', timeout=1) retcode, stdout, stderr = common.run_os_command('ceph osd status', timeout=1)
if debug: if debug:
print("Loop through OSD status data") print("Loop through OSD status data")
for line in stderr.split('\n'): for line in stdout.split('\n'):
# Strip off colour # Strip off colour
line = re.sub(r'\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))', '', line) line = re.sub(r'\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))', '', line)
# Split it for parsing # Split it for parsing
@ -1177,9 +1177,9 @@ def update_zookeeper():
this_dump.update(osd_df[osd]) this_dump.update(osd_df[osd])
this_dump.update(osd_status[osd]) this_dump.update(osd_status[osd])
osd_stats[osd] = this_dump osd_stats[osd] = this_dump
except KeyError: 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
pass logger.out('Failed to parse OSD stats into dictionary: {}'.format(e), state='w')
# Trigger updates for each OSD on this node # Trigger updates for each OSD on this node
if debug: if debug:
@ -1191,9 +1191,9 @@ def update_zookeeper():
zkhandler.writedata(zk_conn, { zkhandler.writedata(zk_conn, {
'/ceph/osds/{}/stats'.format(osd): str(stats) '/ceph/osds/{}/stats'.format(osd): str(stats)
}) })
except KeyError: 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
pass logger.out('Failed to upload OSD stats from dictionary: {}'.format(e), state='w')
osds_this_node += 1 osds_this_node += 1
memalloc = 0 memalloc = 0