refactor AdminClient (#3781)

* refactor AdminClient * fix test case, unify all getAdminAddrFromStoreAddr into AdminClient * add more test cases * address @panda-sheep's comment
vesoft-inc · Jan 28, 2022 · 9e143ac · 9e143ac
1 parent f70b6a7
commit 9e143ac
Show file tree

Hide file tree

Showing 40 changed files with 861 additions and 558 deletions.
diff --git a/src/interface/storage.thrift b/src/interface/storage.thrift
@@ -703,7 +703,7 @@ service GraphStorageService {
 //////////////////////////////////////////////////////////
 // Common response for admin methods
 struct AdminExecResp {
-    1: required ResponseCommon   result,
+    1: required ResponseCommon  result,
     2: optional meta.StatsItem  stats,
 }
 
@@ -759,27 +759,36 @@ struct CreateCPRequest {
     2: binary                     name,
 }
 
+struct CreateCPResp {
+    1: common.ErrorCode             code,
+    2: list<common.CheckpointInfo>  info,
+}
 
 struct DropCPRequest {
     1: list<common.GraphSpaceID>  space_ids,
     2: binary                     name,
 }
 
+struct DropCPResp {
+    1: common.ErrorCode             code,
+}
 
 enum EngineSignType {
     BLOCK_ON = 1,
     BLOCK_OFF = 2,
 }
 
-
 struct BlockingSignRequest {
     1: list<common.GraphSpaceID>    space_ids,
     2: required EngineSignType      sign,
 }
 
+struct BlockingSignResp {
+    1: common.ErrorCode             code,
+}
 
 struct GetLeaderPartsResp {
-    1: required ResponseCommon result,
+    1: common.ErrorCode             code,
     2: map<common.GraphSpaceID, list<common.PartitionID>> (
         cpp.template = "std::unordered_map") leader_parts;
 }
@@ -798,11 +807,6 @@ struct RebuildIndexRequest {
     3: common.IndexID               index_id,
 }
 
-struct CreateCPResp {
-    1: required ResponseCommon      result,
-    2: list<common.CheckpointInfo>  info,
-}
-
 struct ListClusterInfoResp {
     1: required ResponseCommon  result,
     2: common.DirInfo           dir,
@@ -811,7 +815,7 @@ struct ListClusterInfoResp {
 struct ListClusterInfoReq {
 }
 
-struct AddAdminTaskRequest {
+struct AddTaskRequest {
     // rebuild index / flush / compact / statis
     1: meta.AdminCmd                        cmd
     2: i32                                  job_id
@@ -820,11 +824,19 @@ struct AddAdminTaskRequest {
     5: optional i32                         concurrency
 }
 
-struct StopAdminTaskRequest {
+struct AddTaskResp {
+    1: common.ErrorCode                     code,
+}
+
+struct StopTaskRequest {
     1: i32                                  job_id
     2: i32                                  task_id
 }
 
+struct StopTaskResp {
+    1: common.ErrorCode                     code,
+}
+
 service StorageAdminService {
     // Interfaces for admin operations
     AdminExecResp transLeader(1: TransLeaderReq req);
@@ -836,20 +848,16 @@ service StorageAdminService {
 
     // Interfaces for nebula cluster checkpoint
     CreateCPResp  createCheckpoint(1: CreateCPRequest req);
-    AdminExecResp dropCheckpoint(1: DropCPRequest req);
-    AdminExecResp blockingWrites(1: BlockingSignRequest req);
-
-    // Interfaces for rebuild index
-    AdminExecResp rebuildTagIndex(1: RebuildIndexRequest req);
-    AdminExecResp rebuildEdgeIndex(1: RebuildIndexRequest req);
+    DropCPResp    dropCheckpoint(1: DropCPRequest req);
+    BlockingSignResp blockingWrites(1: BlockingSignRequest req);
 
     // Return all leader partitions on this host
     GetLeaderPartsResp getLeaderParts(1: GetLeaderReq req);
     // Return all peers
     AdminExecResp checkPeers(1: CheckPeersReq req);
 
-    AdminExecResp addAdminTask(1: AddAdminTaskRequest req);
-    AdminExecResp stopAdminTask(1: StopAdminTaskRequest req);
+    AddTaskResp   addAdminTask(1: AddTaskRequest req);
+    StopTaskResp  stopAdminTask(1: StopTaskRequest req);
 }
 
 

diff --git a/src/meta/ActiveHostsMan.cpp b/src/meta/ActiveHostsMan.cpp
@@ -226,21 +226,6 @@ ErrorOr<nebula::cpp2::ErrorCode, std::vector<HostAddr>> ActiveHostsMan::getActiv
   return activeHosts;
 }
 
-ErrorOr<nebula::cpp2::ErrorCode, std::vector<HostAddr>> ActiveHostsMan::getActiveAdminHosts(
-    kvstore::KVStore* kv, int32_t expiredTTL, cpp2::HostRole role) {
-  auto hostsRet = getActiveHosts(kv, expiredTTL, role);
-  if (!nebula::ok(hostsRet)) {
-    return nebula::error(hostsRet);
-  }
-  auto hosts = nebula::value(hostsRet);
-
-  std::vector<HostAddr> adminHosts(hosts.size());
-  std::transform(hosts.begin(), hosts.end(), adminHosts.begin(), [](const auto& h) {
-    return Utils::getAdminAddrFromStoreAddr(h);
-  });
-  return adminHosts;
-}
-
 ErrorOr<nebula::cpp2::ErrorCode, bool> ActiveHostsMan::isLived(kvstore::KVStore* kv,
                                                                const HostAddr& host) {
   auto activeHostsRet = getActiveHosts(kv);

diff --git a/src/meta/ActiveHostsMan.h b/src/meta/ActiveHostsMan.h
@@ -126,9 +126,6 @@ class ActiveHostsMan final {
   static ErrorOr<nebula::cpp2::ErrorCode, std::vector<HostAddr>> getActiveHostsWithZones(
       kvstore::KVStore* kv, GraphSpaceID spaceId, int32_t expiredTTL = 0);
 
-  static ErrorOr<nebula::cpp2::ErrorCode, std::vector<HostAddr>> getActiveAdminHosts(
-      kvstore::KVStore* kv, int32_t expiredTTL = 0, cpp2::HostRole role = cpp2::HostRole::STORAGE);
-
   static ErrorOr<nebula::cpp2::ErrorCode, bool> isLived(kvstore::KVStore* kv, const HostAddr& host);
 
   static ErrorOr<nebula::cpp2::ErrorCode, HostInfo> getHostInfo(kvstore::KVStore* kv,