src/tools: fix dedup tool's name

Signed-off-by: Myoungwon Oh <ommw@sk.com>

diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in
index 96037883f557d13319649a25d98989825643cad4..029be6cfcc847f5a222b9b250608595ba556b5e3 100644 (file)
--- a/alpine/APKBUILD.in
+++ b/alpine/APKBUILD.in
@@ -436,7 +436,7 @@ ceph_test() {
                ceph-osdomap-tool \
                ceph-kvstore-tool \
                ceph-debugpack \
-               cephdeduptool
+               ceph-dedup-tool
 
        _pkg $_libdir ceph/ceph-monstore-update-crush.sh
 }

diff --git a/ceph.spec.in b/ceph.spec.in
index a12ceade0f7e36ab58031c2110ec4c07fe6ab9ea..e6fce9b8921422392456fef198327e79678cd04f 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -2041,7 +2041,7 @@ fi
 %{_bindir}/ceph_test_*
 %{_bindir}/ceph-coverage
 %{_bindir}/ceph-debugpack
-%{_bindir}/cephdeduptool
+%{_bindir}/ceph-dedup-tool
 %{_mandir}/man8/ceph-debugpack.8*
 %dir %{_libdir}/ceph
 %{_libdir}/ceph/ceph-monstore-update-crush.sh

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index 200269fa6d50dd6c973745a5c637e5c3b77d7363..dae063ab6c42593a8aa0c53e3c25f5c2cc490bca 100644 (file)
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -17,6 +17,6 @@ usr/bin/ceph_rgw_multiparser
 usr/bin/ceph_scratchtool
 usr/bin/ceph_scratchtoolpp
 usr/bin/ceph_test_*
-usr/bin/cephdeduptool
+usr/bin/ceph-dedup-tool
 usr/lib/ceph/ceph-monstore-update-crush.sh
 usr/share/java/libcephfs-test.jar

diff --git a/qa/workunits/rados/test_dedup_tool.sh b/qa/workunits/rados/test_dedup_tool.sh
index 2caf1c26ca24ab183b21050bb193c9114e325867..8535ad241b329b79edc1420c956081a2b8a16ee0 100755 (executable)
--- a/qa/workunits/rados/test_dedup_tool.sh
+++ b/qa/workunits/rados/test_dedup_tool.sh
@@ -33,12 +33,12 @@ if [ -n "$CEPH_BIN" ] ; then
    # CMake env
    RADOS_TOOL="$CEPH_BIN/rados"
    CEPH_TOOL="$CEPH_BIN/ceph"
-   DEDUP_TOOL="$CEPH_BIN/cephdeduptool"
+   DEDUP_TOOL="$CEPH_BIN/ceph-dedup-tool"
 else
    # executables should be installed by the QA env 
    RADOS_TOOL=$(which rados)
    CEPH_TOOL=$(which ceph)
-   DEDUP_TOOL=$(which cephdeduptool)
+   DEDUP_TOOL=$(which ceph-dedup-tool)
 fi
 
 POOL=dedup_pool

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index d31f3d240844abe4d5c9f6ba978d764febb50bfa..a524df85eb2702bc022287f7d1f977ccab464b41 100644 (file)
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -101,10 +101,10 @@ target_link_libraries(ceph-authtool global ${EXTRALIBS} ${CRYPTO_LIBS})
 install(TARGETS ceph-authtool DESTINATION bin)
 
 if(WITH_TESTS)
-set(cephdeduptool_srcs ceph_dedup_tool.cc)
-add_executable(cephdeduptool ${cephdeduptool_srcs})
-target_link_libraries(cephdeduptool librados global cls_cas_client)
-install(TARGETS cephdeduptool DESTINATION bin)
+set(ceph_dedup_tool_srcs ceph_dedup_tool.cc)
+add_executable(ceph-dedup-tool ${ceph_dedup_tool_srcs})
+target_link_libraries(ceph-dedup-tool librados global cls_cas_client)
+install(TARGETS ceph-dedup-tool DESTINATION bin)
 endif(WITH_TESTS)
 
 if(WITH_CEPHFS)

diff --git a/src/tools/ceph_dedup_tool.cc b/src/tools/ceph_dedup_tool.cc
index 07f68b3c37536672753a6f62d486c524be95f696..f3a53ef5ca799762be66eb9e5efda97fc72f0772 100644 (file)
--- a/src/tools/ceph_dedup_tool.cc
+++ b/src/tools/ceph_dedup_tool.cc
@@ -288,9 +288,10 @@ void EstimateDedupRatio::print_status(Formatter *f, ostream &out)
     f->dump_string("PID", stringify(get_pid()));
     for (auto p : local_chunk_statistics) {
       f->open_object_section("fingerprint object");
-      f->dump_string("fingperint", p.first);
+      f->dump_string("fingerprint", p.first);
       f->dump_string("count", stringify(p.second.first));
       f->dump_string("chunk_size", stringify(p.second.second));
+      f->close_section();
     }
     f->close_section();
     f->open_object_section("Status");