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:25:02 -0700
commita0379725851c92b0ea9bb56990a1a62f43cdbdba (patch)
tree18a73e0532acc414eec1a3157286d8978c9a1a20
parented50707c20197bd64719d9a236683d4f459e7129 (diff)
downloadceph-a0379725851c92b0ea9bb56990a1a62f43cdbdba.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 696bcf0c710..a93545d4437 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1492,13 +1492,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;
}
}