ceph-disk: handle missing journal_uuid field gracefully

Only lower if we know it's not None.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 562e1716bd4b5372716e502a5e4dd872d381bfb7)

diff --git a/src/ceph-disk b/src/ceph-disk
index c1d6a4d2cdc219fe97d8a687347f8d66e5c336c7..71c3a75b54dad45846c0f6d4ce5ef36c8215019f 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1671,9 +1671,11 @@ def more_osd_info(path, uuid_map):
     if who:
         desc.append('osd.%s' % who)
 
-    journal_uuid = get_oneliner(path, 'journal_uuid').lower()
-    if journal_uuid and journal_uuid in uuid_map:
-        desc.append('journal %s' % uuid_map[journal_uuid])
+    journal_uuid = get_oneliner(path, 'journal_uuid')
+    if journal_uuid:
+        journal_uuid = journal_uuid.lower()
+        if journal_uuid in uuid_map:
+            desc.append('journal %s' % uuid_map[journal_uuid])
 
     return desc
 
@@ -1747,9 +1749,9 @@ def main_list(args):
                 try:
                     tpath = mount(dev=dev, fstype=fs, options='')
                     try:
-                        journal_uuid = get_oneliner(tpath, 'journal_uuid').lower()
+                        journal_uuid = get_oneliner(tpath, 'journal_uuid')
                         if journal_uuid:
-                            journal_map[journal_uuid] = dev
+                            journal_map[journal_uuid.lower()] = dev
                     finally:
                         unmount(tpath)
                 except: