From 4f72ba545e204a24a55adead43c61cb1d4394381 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 16 Dec 2014 17:02:56 -0800 Subject: [PATCH] ceph_objectstore_tool: Rename generated binary to ceph-objectstore-tool Signed-off-by: David Zafman --- ceph.spec.in | 2 +- debian/ceph-test.install | 2 +- src/.gitignore | 2 +- src/test/ceph-helpers.sh | 12 ++++++------ src/test/ceph_objectstore_tool.py | 8 ++++---- src/tools/Makefile.am | 2 +- src/tools/ceph_objectstore_tool.cc | 22 +++++++++++----------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index c5a68c2af205f..c08a72b6b53b3 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -734,7 +734,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 3dfeeb15ecd42..f2fcd603d87dc 100644 --- a/debian/ceph-test.install +++ b/debian/ceph-test.install @@ -1,6 +1,6 @@ usr/bin/ceph-coverage usr/bin/ceph_bench_log -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 66b1f702a60e9..6e76998b46e66 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -24,7 +24,7 @@ Makefile /ceph-syn /ceph.conf /ceph_bench_log -/ceph_objectstore_tool +/ceph-objectstore-tool /ceph_mon_store_converter /ceph_multi_stress_watch /ceph_erasure_code diff --git a/src/test/ceph-helpers.sh b/src/test/ceph-helpers.sh index fc0f7cf4f8242..00e2d82abed3b 100755 --- a/src/test/ceph-helpers.sh +++ b/src/test/ceph-helpers.sh @@ -647,17 +647,17 @@ function test_get_not_primary() { ####################################################################### ## -# Run ceph_objectstore_tool against the OSD **id** using the data path +# Run ceph-objectstore-tool against the OSD **id** using the data path # **dir**. The OSD is killed with TERM prior to running -# ceph_objectstore_tool because access to the data path is +# ceph-objectstore-tool because access to the data path is # exclusive. The OSD is restarted after the command completes. The # objectstore_tool returns after all PG are active+clean again. # # @param dir the data path of the OSD # @param id the OSD id -# @param ... arguments to ceph_objectstore_tool -# @param STDIN the input of ceph_objectstore_tool -# @param STDOUT the output of ceph_objectstore_tool +# @param ... arguments to ceph-objectstore-tool +# @param STDIN the input of ceph-objectstore-tool +# @param STDOUT the output of ceph-objectstore-tool # @return 0 on success, 1 on error # function objectstore_tool() { @@ -668,7 +668,7 @@ function objectstore_tool() { local osd_data=$dir/$id kill_daemons $dir TERM osd.$id >&2 < /dev/null || return 1 - ceph_objectstore_tool \ + ceph-objectstore-tool \ --data-path $osd_data \ --journal-path $osd_data/journal \ "$@" || return 1 diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index 92c5ea782f653..e1870e61079c1 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -224,7 +224,7 @@ def main(argv): pid = os.getpid() TESTDIR = "/tmp/test.{pid}".format(pid=pid) DATADIR = "/tmp/data.{pid}".format(pid=pid) - CFSD_PREFIX = "./ceph_objectstore_tool --data-path " + OSDDIR + "/{osd} --journal-path " + OSDDIR + "/{osd}.journal " + CFSD_PREFIX = "./ceph-objectstore-tool --data-path " + OSDDIR + "/{osd} --journal-path " + OSDDIR + "/{osd}.journal " PROFNAME = "testecprofile" os.environ['CEPH_CONF'] = CEPH_CONF @@ -449,11 +449,11 @@ def main(argv): ERRORS += test_failure(cmd, "Must provide --type (filestore, memstore, keyvaluestore-dev)") # Don't specify a data-path - cmd = "./ceph_objectstore_tool --journal-path {dir}/{osd}.journal --type memstore --op list --pgid {pg}".format(dir=OSDDIR, osd=ONEOSD, pg=ONEPG) + cmd = "./ceph-objectstore-tool --journal-path {dir}/{osd}.journal --type memstore --op list --pgid {pg}".format(dir=OSDDIR, 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 {dir}/{osd} --op list --pgid {pg}".format(dir=OSDDIR, osd=ONEOSD, pg=ONEPG) + cmd = "./ceph-objectstore-tool --type filestore --data-path {dir}/{osd} --op list --pgid {pg}".format(dir=OSDDIR, osd=ONEOSD, pg=ONEPG) ERRORS += test_failure(cmd, "Must provide --journal-path") # Test --op list and generate json for all objects @@ -875,7 +875,7 @@ def main(argv): 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 ceecc944da380..d92ed55853633 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 1d430e8f9f7a7..9b800a5786033 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -1559,7 +1559,7 @@ int do_import(ObjectStore *store, OSDSuperblock& sb) cerr << std::endl; cerr << "OSD requires sharding to be enabled" << std::endl; cerr << std::endl; - cerr << "If you wish to import, first do 'ceph_objectstore_tool...--op set-allow-sharded-objects'" << std::endl; + cerr << "If you wish to import, first do 'ceph-objectstore-tool...--op set-allow-sharded-objects'" << std::endl; } return 1; } @@ -2004,16 +2004,16 @@ void usage(po::options_description &desc) cerr << std::endl; cerr << "Positional syntax:" << std::endl; cerr << 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 ... (get|rm)-(attr|omap) " << std::endl; - cerr << "ceph_objectstore_tool ... get-omaphdr" << std::endl; - cerr << "ceph_objectstore_tool ... set-omaphdr [file]" << 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 ... (get|rm)-(attr|omap) " << std::endl; + cerr << "ceph-objectstore-tool ... get-omaphdr" << std::endl; + cerr << "ceph-objectstore-tool ... set-omaphdr [file]" << 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; cerr << " can be a JSON object description as displayed" << std::endl; cerr << "by --op list." << std::endl; @@ -2098,7 +2098,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