curvefs_tool readme & curvefs_tool adjust

1. add curvefs_tool readme 2. adjust some curvefs_tool output 3. fix check-copyset no output by set show = true 4. fix query-partition name show error in --example
Cyber-SiKu · Dec 16, 2021 · af03f70 · af03f70
1 parent 9e370f2
commit af03f70
Show file tree

Hide file tree

Showing 8 changed files with 527 additions and 22 deletions.
diff --git a/curvefs/src/tools/README.md b/curvefs/src/tools/README.md
diff --git a/curvefs/src/tools/check/curvefs_copyset_check.cpp b/curvefs/src/tools/check/curvefs_copyset_check.cpp
@@ -32,8 +32,8 @@ namespace check {
 
 void CopysetCheckTool::PrintHelp() {
     CurvefsToolRpc::PrintHelp();
-    std::cout << " -copysetsId=" << FLAGS_copysetId
-              << " -poolsId=" << FLAGS_poolId
+    std::cout << " -copysetId=" << FLAGS_copysetId
+              << " -poolId=" << FLAGS_poolId
               << " [-metaserverAddr=" << FLAGS_metaserverAddr << "]";
     std::cout << std::endl;
 }

diff --git a/curvefs/src/tools/check/curvefs_copyset_check.h b/curvefs/src/tools/check/curvefs_copyset_check.h
@@ -48,7 +48,7 @@ class CopysetCheckTool
           curvefs::metaserver::copyset::CopysetService_Stub> {
  public:
     explicit CopysetCheckTool(const std::string& cmd = kCopysetCheckCmd,
-                              bool show = false)
+                              bool show = true)
         : CurvefsToolRpc(cmd) {
         show_ = show;
     }

diff --git a/curvefs/src/tools/curvefs_tool_define.h b/curvefs/src/tools/curvefs_tool_define.h
@@ -82,22 +82,22 @@ const char kConfPathHelp[] = "[-confPath=/etc/curvefs/tools.conf]";
 const char kHelpStr[] =
     "Usage: curvefs_tool [Command] [OPTIONS...]\n"
     "COMMANDS:\n"  // NOLINT
-    "version: show the version of cluster\n"
-    "build-topology: build cluster topology based on topo.json\n"
-    "umount-fs: umount curvefs from local and cluster\n"
-    "usage-metadata: show the metadata usage of cluster\n"
-    "status-mds: show the status of mds\n"
+    "version:           show the version of curvefs_tool\n"
+    "status-mds:        show the status of mds\n"
     "status-metaserver: show the status of metaserver\n"
-    "status-etcd: show the status of etcd\n"
-    "status-copyset: show the status of copyset\n"
-    "list-fs: list all fs in cluster\n"
-    "list-copysetInfo: list all copysetInfo in cluster\n"
-    "query-copyset: query copyset by copysetId\n"
-    "query-partition: query copyset in partition\n"
-    "query-metaserver: query metaserver by metaserverId or metaserverName\n"
-    "query-fs: query fs by fsId or fsName\n"
-    "delete-fs: delete fs by fsId or fsName\n"
-    "check-copyset: checkout copyset status\n"
+    "status-etcd:       show the status of etcd\n"
+    "status-copyset:    show the status of copyset\n"
+    "list-fs:           list all fs in cluster\n"
+    "list-copysetInfo:  list all copysetInfo in cluster\n"
+    "build-topology:    build cluster topology based on topo.json\n"
+    "umount-fs:         umount curvefs from local and cluster\n"
+    "usage-metadata:    show the metadata usage of cluster\n"
+    "delete-fs:         delete fs by fsName\n"
+    "check-copyset:     checkout copyset status\n"
+    "query-copyset:     query copyset by copysetId and poolId\n"
+    "query-partition:   query copyset in partition by partitionId\n"
+    "query-metaserver:  query metaserver by metaserverId or metaserverName\n"
+    "query-fs:          query fs by fsId or fsName\n"
     "You can specify the config path by -confPath to avoid typing too many "
     "options\n";  // NOLINT
 

diff --git a/curvefs/src/tools/list/curvefs_copysetinfo_list.cpp b/curvefs/src/tools/list/curvefs_copysetinfo_list.cpp
@@ -62,7 +62,10 @@ bool CopysetInfoListTool::AfterSendRequestToHost(const std::string& host) {
         ret = false;
     } else if (show_) {
         for (auto const& i : response_->copysetvalues()) {
-            std::cout << i.DebugString() << " ";
+            std::cout << "copyset["
+                      << copyset::GetCopysetKey(i.copysetinfo().poolid(),
+                                                i.copysetinfo().copysetid())
+                      << "]:" << std::endl << i.DebugString() << std::endl;
         }
         std::cout << std::endl;
     }

diff --git a/curvefs/src/tools/list/curvefs_copysetinfo_list.h b/curvefs/src/tools/list/curvefs_copysetinfo_list.h
@@ -27,6 +27,7 @@
 #include <string>
 
 #include "curvefs/proto/topology.pb.h"
+#include "curvefs/src/tools/copyset/curvefs_copyset_base_tool.h"
 #include "curvefs/src/tools/curvefs_tool.h"
 #include "curvefs/src/tools/curvefs_tool_define.h"
 #include "src/common/string_util.h"

diff --git a/curvefs/src/tools/query/curvefs_copyset_query.cpp b/curvefs/src/tools/query/curvefs_copyset_query.cpp
@@ -109,12 +109,12 @@ bool CopysetQueryTool::AfterSendRequestToHost(const std::string& host) {
 
         if (show_) {
             for (auto const& i : copysetKeys_) {
-                std::cout << "copyset[" << i << "]:\n info:\n";
+                std::cout << "copyset[" << i << "]:\n-info:" << std::endl;
                 for (auto const& j : key2Infos_[i]) {
                     std::cout << j.ShortDebugString() << std::endl;
                 }
                 if (FLAGS_detail) {
-                    std::cout << "\nstatus:" << std::endl;
+                    std::cout << "-status:" << std::endl;
                     for (auto const& j : key2Status_[i]) {
                         std::cout << j.ShortDebugString() << std::endl;
                     }

diff --git a/curvefs/src/tools/query/curvefs_partition_query.h b/curvefs/src/tools/query/curvefs_partition_query.h
@@ -44,7 +44,7 @@ class PartitionQueryTool
           curvefs::mds::topology::GetCopysetOfPartitionResponse,
           curvefs::mds::topology::TopologyService_Stub> {
  public:
-    explicit PartitionQueryTool(const std::string& cmd = kCopysetQueryCmd,
+    explicit PartitionQueryTool(const std::string& cmd = kPartitionQueryCmd,
                                 bool show = true)
         : CurvefsToolRpc(cmd) {
         show_ = show;