Merge pull request #4125 from dzafman/wip-11176-hammer

ceph-objectstore-tool: Output only unsupported features when incomatible

Reviewed-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
Loic Dachary 2015-03-23 20:37:14 +01:00
commit 3216a584e0

View File

@ -2557,8 +2557,9 @@ int main(int argc, char **argv)
cerr << "On-disk features: " << superblock.compat_features << std::endl;
}
if (supported.compare(superblock.compat_features) == -1) {
CompatSet unsupported = supported.unsupported(superblock.compat_features);
cerr << "On-disk OSD incompatible features set "
<< superblock.compat_features << std::endl;
<< unsupported << std::endl;
ret = EINVAL;
goto out;
}