]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: silence 'ceph-bluestore-tool' failures 33605/head
authorSébastien Han <seb@redhat.com>
Wed, 19 Feb 2020 15:03:02 +0000 (16:03 +0100)
committerJan Fajerski <jfajerski@suse.com>
Fri, 28 Feb 2020 12:48:33 +0000 (13:48 +0100)
If 'ceph-bluestore-tool' fails on a device, the json output of the list
command will be messed up. Ignoring stderr of that command fixes this.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit e8828fe76a0c78786e53a1bd63c3fc574e36a6f0)

src/ceph-volume/ceph_volume/devices/raw/list.py

index 5d610c7a02425c240ad700ff43fdd2d330b2d4f1..5e8202a7897dc225d953b2dc305b780e2fc444c3 100644 (file)
@@ -43,7 +43,7 @@ class List(object):
             # bluestore?
             out, err, ret = process.call([
                 'ceph-bluestore-tool', 'show-label',
-                '--dev', dev])
+                '--dev', dev], verbose_on_failure=False)
             if ret:
                 logger.debug('No label on %s' % dev)
                 continue