openstack
/
charms.ceph
Code Issues Proposed changes

Merge "When ceph-disk has failed, collect more data"

This commit is contained in:
Zuul 2018-04-05 14:32:01 +00:00 committed by Gerrit Code Review
parent 68c054fc66 6238df8a36
commit 22f7c25560
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ceph/utils.py
View File

@ -1514,10 +1514,19 @@ def osdize_dev(dev, osd_format, osd_journal, reformat_osd=False,
log("osdize cmd: {}".format(cmd))
subprocess.check_call(cmd)
except subprocess.CalledProcessError:
try:
lsblk_output = subprocess.check_output(
['lsblk', '-P']).decode('UTF-8')
except subprocess.CalledProcessError as e:
log("Couldn't get lsblk output: {}".format(e), ERROR)
if ignore_errors:
log('Unable to initialize device: {}'.format(dev), WARNING)
if lsblk_output:
log('lsblk output: {}'.format(lsblk_output), DEBUG)
else:
log('Unable to initialize device: {}'.format(dev), ERROR)
if lsblk_output:
log('lsblk output: {}'.format(lsblk_output), WARNING)
raise