fix the error message for verifyVersion (#5797)

vesoft-inc · Jan 5, 2024 · b53554b · b53554b
1 parent 66dfbf5
commit b53554b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/graph/service/GraphFlags.cpp b/src/graph/service/GraphFlags.cpp
@@ -65,7 +65,7 @@ DEFINE_uint32(ft_request_retry_times, 3, "Retry times if fulltext request failed
 DEFINE_bool(enable_client_white_list, true, "Turn on/off the client white list.");
 DEFINE_string(client_white_list,
               nebula::getOriginVersion() + ":3.0.0",
-              "A white list for different client versions, separate with colon.");
+              "A white list for different client handshakeKey, separate with colon.");
 
 #endif
 

diff --git a/src/graph/service/GraphService.cpp b/src/graph/service/GraphService.cpp
@@ -263,10 +263,8 @@ folly::Future<cpp2::VerifyClientVersionResp> GraphService::future_verifyClientVe
       uniqueWhiteList.append(version);
     });
     resp.error_code_ref() = nebula::cpp2::ErrorCode::E_CLIENT_SERVER_INCOMPATIBLE;
-    resp.error_msg_ref() = folly::stringPrintf(
-        "Graph client version(%s) is not accepted, current graph client white list: %s.",
-        req.get_version().c_str(),
-        uniqueWhiteList.c_str());
+    resp.error_msg_ref() = folly::stringPrintf("Graph client handshakeKey(%s) is not accepted.",
+                                               req.get_version().c_str());
   } else {
     resp.error_code_ref() = nebula::cpp2::ErrorCode::SUCCEEDED;
   }

diff --git a/src/graph/service/test/StandAloneTestGraphFlags.cpp b/src/graph/service/test/StandAloneTestGraphFlags.cpp
@@ -10,4 +10,4 @@ DEFINE_uint32(ft_request_retry_times, 3, "Retry times if fulltext request failed
 DEFINE_bool(enable_client_white_list, true, "Turn on/off the client white list.");
 DEFINE_string(client_white_list,
               nebula::getOriginVersion() + ":3.0.0",
-              "A white list for different client versions, separate with colon.");
+              "A white list for different client handshakeKey, separate with colon.");
diff --git a/src/meta/processors/admin/VerifyClientVersionProcessor.cpp b/src/meta/processors/admin/VerifyClientVersionProcessor.cpp
@@ -10,7 +10,7 @@
 DEFINE_bool(enable_client_white_list, true, "Turn on/off the client white list.");
 DEFINE_string(client_white_list,
               nebula::getOriginVersion() + ":3.0.0",
-              "A white list for different client versions, separate with colon.");
+              "A white list for different client handshakeKey, separate with colon.");
 
 namespace nebula {
 namespace meta {
@@ -21,10 +21,8 @@ void VerifyClientVersionProcessor::process(const cpp2::VerifyClientVersionReq& r
   if (FLAGS_enable_client_white_list &&
       whiteList.find(req.get_client_version()) == whiteList.end()) {
     resp_.code_ref() = nebula::cpp2::ErrorCode::E_CLIENT_SERVER_INCOMPATIBLE;
-    resp_.error_msg_ref() = folly::stringPrintf(
-        "Meta client version(%s) is not accepted, current meta client white list: %s.",
-        req.get_client_version().c_str(),
-        FLAGS_client_white_list.c_str());
+    resp_.error_msg_ref() = folly::stringPrintf("Meta client handshakeKey(%s) is not accepted.",
+                                                req.get_client_version().c_str());
   }
 
   onFinished();