From 7470c7ca02ef6313b925be3ce4b27437a0c2e1e0 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 3 Mar 2015 10:41:28 -0800 Subject: [PATCH] ceph_objectstore_tool: Rename generated binary to ceph-objectstore-tool Signed-off-by: David Zafman (cherry picked from commit 4f72ba545e204a24a55adead43c61cb1d4394381) Conflicts: debian/ceph-test.install src/.gitignore src/test/ceph-helpers.sh (doesn't exist in firefly) src/test/ceph_objectstore_tool.py src/tools/ceph_objectstore_tool.cc --- ceph.spec.in | 2 +- debian/ceph-test.install | 2 +- src/.gitignore | 2 +- src/test/ceph_objectstore_tool.py | 8 ++++---- src/tools/Makefile.am | 2 +- src/tools/ceph_objectstore_tool.cc | 20 ++++++++++---------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 3527f159b9828..e1a8318666ce1 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -706,7 +706,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{_bindir}/ceph_smalliobenchdumb %{_bindir}/ceph_smalliobenchfs %{_bindir}/ceph_smalliobenchrbd -%{_bindir}/ceph_objectstore_tool +%{_bindir}/ceph-objectstore-tool %{_bindir}/ceph_streamtest %{_bindir}/ceph_test_* %{_bindir}/ceph_tpbench diff --git a/debian/ceph-test.install b/debian/ceph-test.install index 8c4773025ede2..4643a7c913074 100644 --- a/debian/ceph-test.install +++ b/debian/ceph-test.install @@ -1,7 +1,7 @@ usr/bin/ceph-coverage usr/bin/ceph_bench_log usr/bin/ceph_dupstore -usr/bin/ceph_objectstore_tool +usr/bin/ceph-objectstore-tool usr/bin/ceph_kvstorebench usr/bin/ceph_multi_stress_watch usr/bin/ceph_erasure_code diff --git a/src/.gitignore b/src/.gitignore index 4886f33d9c53b..1bcad4fa1aca2 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -24,7 +24,7 @@ Makefile /ceph.conf /ceph_bench_log /ceph_dupstore -/ceph_objectstore_tool +/ceph-objectstore-tool /ceph_mon_store_converter /ceph_multi_stress_watch /ceph_erasure_code diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index ba0a8182731bd..70b7a21ff966a 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -188,7 +188,7 @@ def main(): pid = os.getpid() TESTDIR = "/tmp/test.{pid}".format(pid=pid) DATADIR = "/tmp/data.{pid}".format(pid=pid) - CFSD_PREFIX = "./ceph_objectstore_tool --data-path dev/{osd} --journal-path dev/{osd}.journal " + CFSD_PREFIX = "./ceph-objectstore-tool --data-path dev/{osd} --journal-path dev/{osd}.journal " PROFNAME = "testecprofile" vstart(new=True) @@ -404,11 +404,11 @@ def main(): ERRORS += test_failure(cmd, "Must provide --type (filestore, memstore, keyvaluestore-dev)") # Don't specify a data-path - cmd = "./ceph_objectstore_tool --journal-path dev/{osd}.journal --type memstore --op list --pgid {pg}".format(osd=ONEOSD, pg=ONEPG) + cmd = "./ceph-objectstore-tool --journal-path dev/{osd}.journal --type memstore --op list --pgid {pg}".format(osd=ONEOSD, pg=ONEPG) ERRORS += test_failure(cmd, "Must provide --data-path") # Don't specify a journal-path for filestore - cmd = "./ceph_objectstore_tool --type filestore --data-path dev/{osd} --op list --pgid {pg}".format(osd=ONEOSD, pg=ONEPG) + cmd = "./ceph-objectstore-tool --type filestore --data-path dev/{osd} --op list --pgid {pg}".format(osd=ONEOSD, pg=ONEPG) ERRORS += test_failure(cmd, "Must provide --journal-path") # Test --op list and generate json for all objects @@ -726,7 +726,7 @@ def main(): if string.find(pg, "{id}.".format(id=REPID)) != 0: continue file = os.path.join(dir, pg) - cmd = "./ceph_objectstore_tool import-rados {pool} {file}".format(pool=NEWPOOL, file=file) + cmd = "./ceph-objectstore-tool import-rados {pool} {file}".format(pool=NEWPOOL, file=file) logging.debug(cmd) ret = call(cmd, shell=True, stdout=nullfd) if ret != 0: diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index edd9ccc06e803..c554bf8cd6709 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -16,7 +16,7 @@ ceph_objectstore_tool_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_ if LINUX ceph_objectstore_tool_LDADD += -ldl endif # LINUX -bin_PROGRAMS += ceph_objectstore_tool +bin_PROGRAMS += ceph-objectstore-tool monmaptool_SOURCES = tools/monmaptool.cc monmaptool_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index ea209b2524109..22007ffaeb171 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -1780,16 +1780,16 @@ void usage(po::options_description &desc) cerr << std::endl; cerr << "(requires --data, --journal (for filestore type) and --pgid to be specified)" << std::endl; cerr << "(optional [file] argument will read stdin or write stdout if not specified or if '-' specified)" << std::endl; - cerr << "ceph_objectstore_tool ... (get|set)-bytes [file]" << std::endl; - cerr << "ceph_objectstore_tool ... (set-(attr|omap) [file]" << std::endl; - cerr << "ceph_objectstore_tool ... (set-omaphdr) [file]" << std::endl; - cerr << "ceph_objectstore_tool ... (get|rm)-(attr|omap) " << std::endl; - cerr << "ceph_objectstore_tool ... (get-omaphdr)" << std::endl; - cerr << "ceph_objectstore_tool ... list-attrs" << std::endl; - cerr << "ceph_objectstore_tool ... list-omap" << std::endl; - cerr << "ceph_objectstore_tool ... remove" << std::endl; + cerr << "ceph-objectstore-tool ... (get|set)-bytes [file]" << std::endl; + cerr << "ceph-objectstore-tool ... (set-(attr|omap) [file]" << std::endl; + cerr << "ceph-objectstore-tool ... (set-omaphdr) [file]" << std::endl; + cerr << "ceph-objectstore-tool ... (get|rm)-(attr|omap) " << std::endl; + cerr << "ceph-objectstore-tool ... (get-omaphdr)" << std::endl; + cerr << "ceph-objectstore-tool ... list-attrs" << std::endl; + cerr << "ceph-objectstore-tool ... list-omap" << std::endl; + cerr << "ceph-objectstore-tool ... remove" << std::endl; cerr << std::endl; - cerr << "ceph_objectstore_tool import-rados [file]" << std::endl; + cerr << "ceph-objectstore-tool import-rados [file]" << std::endl; cerr << std::endl; exit(1); } @@ -1858,7 +1858,7 @@ int main(int argc, char **argv) // Handle completely different operation "import-rados" if (object == "import-rados") { if (vm.count("objcmd") == 0) { - cerr << "ceph_objectstore_tool import-rados [file]" << std::endl; + cerr << "ceph-objectstore-tool import-rados [file]" << std::endl; exit(1); } -- 2.39.5