ceph-objectstore-tool: Warn if --type specified and doesn't match fs

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 1988c80b6b3544d7dae0d9c1a562d43f2708c8b9..7f39f92ca2efc397e643dbba962b489d0075a324 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -2316,7 +2316,11 @@ int main(int argc, char **argv)
     bufferlist bl;
     bl.read_fd(fd, 64);
     if (bl.length()) {
-      type = string(bl.c_str(), bl.length() - 1);  // drop \n
+      string dp_type = string(bl.c_str(), bl.length() - 1);  // drop \n
+      if (vm.count("type") && dp_type != "" && type != dp_type)
+        cerr << "WARNING: Ignoring type \"" << type << "\" - found data-path type \""
+             << dp_type << "\"" << std::endl;
+      type = dp_type;
       //cout << "object store type is " << type << std::endl;
     }
     ::close(fd);