From 3f9e46779addaa07d04d501113eb95cea95b802b Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 22 Jun 2015 18:38:01 -0700 Subject: [PATCH] tools: Fix dump-super which doesn't require pgid A valid pgid had to be specified in order for superblock to be displayed, but it was otherwise ignored. Fix message that didn't include dump-super Signed-off-by: David Zafman (cherry picked from commit fd1772e0ac4cb801d6f3b056645eeb4d3d6ef001) --- src/tools/ceph_objectstore_tool.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index 9dcc81e2b86c6..c5e930755a2d8 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -3216,6 +3216,15 @@ int main(int argc, char **argv) goto out; } + if (op == "dump-super") { + formatter->open_object_section("superblock"); + superblock.dump(formatter); + formatter->close_section(); + formatter->flush(cout); + cout << std::endl; + goto out; + } + ret = fs->list_collections(ls); if (ret < 0) { cerr << "failed to list pgs: " << cpp_strerror(ret) << std::endl; @@ -3516,14 +3525,8 @@ int main(int argc, char **argv) fs->apply_transaction(*t); cout << "Removal succeeded" << std::endl; } - } else if (op == "dump-super") { - formatter->open_object_section("superblock"); - superblock.dump(formatter); - formatter->close_section(); - formatter->flush(cout); - cout << std::endl; } else { - cerr << "Must provide --op (info, log, remove, export, import, list, fix-lost, list-pgs, rm-past-intervals)" + cerr << "Must provide --op (info, log, remove, export, import, list, fix-lost, list-pgs, rm-past-intervals, set-allow-sharded-objects, dump-journal, dump-super)" << std::endl; usage(desc); ret = 1; -- 2.39.5