From 17c6045773b818101ce6a52aad622bd3a37447ba Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Sun, 20 Sep 2015 14:00:16 +0200 Subject: [PATCH] ceph-disk: a journal partition may survive a data partition When a data partition is removed and the journal partition is not removed, ceph-disk list will not find a journal_for information and should just ignore it. http://tracker.ceph.com/issues/13157 Fixes: #13157 Signed-off-by: Loic Dachary --- src/ceph-disk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ceph-disk b/src/ceph-disk index 0071fdb8ea272..55319f9fe4096 100755 --- a/src/ceph-disk +++ b/src/ceph-disk @@ -2775,7 +2775,7 @@ def list_format_dev_plain(dev, devices=[], prefix=''): desc = ['ceph data (dmcrypt %s)' % dmcrypt['type'], 'holders: ' + ','.join(dmcrypt['holders'])] elif dev['ptype'] == JOURNAL_UUID: desc.append('ceph journal') - if dev['journal_for']: + if dev.get('journal_for'): desc.append('for %s' % dev['journal_for']) elif dev['ptype'] in (DMCRYPT_JOURNAL_UUID, DMCRYPT_LUKS_JOURNAL_UUID): -- 2.39.5