From: David Zafman <david.zafman@inktank.com>
Date: Tue, 17 Sep 2013 21:59:15 +0000 (-0700)
Subject: osd: read_superblock() not outputing unsupported features when incompatible
X-Git-Tag: v0.71~69^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb195c24381b813252340a6b19b6021a97f99466;p=ceph.git

osd: read_superblock() not outputing unsupported features when incompatible

Use working version of CompatSet::unsupported() to improve log output

Backport: dumpling, cuttlefish

Signed-off-by: David Zafman <david.zafman@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1cdc232b064..4d8a0b4d0d5 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1721,13 +1721,13 @@ int OSD::read_superblock()
     derr << " daemon features " << osd_compat << dendl;
 
     if (osd_compat.writeable(superblock.compat_features)) {
-      derr << "it is still writeable, though. Missing features:" << dendl;
       CompatSet diff = osd_compat.unsupported(superblock.compat_features);
+      derr << "it is still writeable, though. Missing features: " << diff << dendl;
       return -EOPNOTSUPP;
     }
     else {
-      derr << "Cannot write to disk! Missing features:" << dendl;
       CompatSet diff = osd_compat.unsupported(superblock.compat_features);
+      derr << "Cannot write to disk! Missing features: " << diff << dendl;
       return -EOPNOTSUPP;
     }
   }