summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zafman <david.zafman@inktank.com>2013-09-17 14:59:15 -0700
committerDavid Zafman <david.zafman@inktank.com>2013-09-25 11:21:38 -0700
commit35e0f56d97b99778d905291be18da10908381494 (patch)
tree452c5223545ed2519479acd9d3a0d9d3639cf88f
parentd204ffe3d27962ebadd4b1deb2e8b3734e167598 (diff)
downloadceph-35e0f56d97b99778d905291be18da10908381494.tar.gz
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> (cherry picked from commit ccdd614403473ff31fefb6abc985b96f6be6aba1)
-rw-r--r--src/osd/OSD.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f081d9379bd..7f9b601556f 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1639,13 +1639,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;
}
}