refactor(FQDN): feather refactor on idl/dsn.layer2.thrift v2

Author: Samunroyu

src/meta/duplication/meta_duplication_service.cpp

@@ -765,9 +765,7 @@ void meta_duplication_service::check_follower_app_if_create_completed(
                 } else {
                     for (const auto &pc : resp.partitions) {
                         host_port primary;
-                        std::vector<host_port> secondaries;
                         GET_HOST_PORT(pc, primary, primary);
-                        GET_HOST_PORTS(pc, secondaries, secondaries);
                         if (!primary) {
                             // Fail once the primary replica is unavailable.
                             query_err = ERR_INACTIVE_STATE;
@@ -776,6 +774,8 @@ void meta_duplication_service::check_follower_app_if_create_completed(
 
                         // Once replica count is more than 1, at least one secondary replica
                         // is required.
+                        std::vector<host_port> secondaries;
+                        GET_HOST_PORTS(pc, secondaries, secondaries);
                         if (1 + secondaries.size() < pc.max_replica_count && secondaries.empty()) {
                             query_err = ERR_NOT_ENOUGH_MEMBER;
                             break;

src/meta/greedy_load_balancer.cpp

@@ -153,8 +153,7 @@ bool greedy_load_balancer::all_replica_infos_collected(const node_state &ns)
             return false;
         }
 
-        config_context &cc = *ctx;
-        if (cc.find_from_serving(n) == cc.serving.end()) {
+        if (ctx->find_from_serving(n) == ctx->serving.end()) {
             LOG_INFO("meta server hasn't collected gpid({})'s info of {}", pid, n);
             return false;
         }

src/meta/server_state_restore.cpp

@@ -252,13 +252,17 @@ void server_state::on_query_restore_status(configuration_query_restore_rpc rpc)
         const auto &r_state = app->helpers->restore_states[i];
         const auto &pc = app->pcs[i];
         host_port primary;
-        std::vector<host_port> secondaries;
         GET_HOST_PORT(pc, primary, primary);
-        GET_HOST_PORTS(pc, secondaries, secondaries);
-        if (primary || !secondaries.empty()) {
+        if (primary) {
             // already have primary, restore succeed
             continue;
         }
+
+        std::vector<host_port> secondaries;
+        GET_HOST_PORTS(pc, secondaries, secondaries);
+        if (!secondaries.empty()) {
+            continue;
+        }
         if (r_state.progress < response.restore_progress[i]) {
             response.restore_progress[i] = r_state.progress;
         }

src/replica/replica_context.cpp

@@ -133,16 +133,16 @@ void primary_context::get_replica_config(partition_status::type st,
 
 bool primary_context::check_exist(const ::dsn::host_port &node, partition_status::type st)
 {
-    host_port primary;
-    std::vector<host_port> secondaries;
-    GET_HOST_PORT(pc, primary, primary);
-    GET_HOST_PORTS(pc, secondaries, secondaries);
     switch (st) {
     case partition_status::PS_PRIMARY:
         DCHECK(pc.__isset.hp_primary, "");
+        host_port primary;
+        GET_HOST_PORT(pc, primary, primary);
         return primary == node;
     case partition_status::PS_SECONDARY:
         DCHECK(pc.__isset.hp_secondaries, "");
+        std::vector<host_port> secondaries;
+        GET_HOST_PORTS(pc, secondaries, secondaries);
         return utils::contains(secondaries, node);
     case partition_status::PS_POTENTIAL_SECONDARY:
         return learners.find(node) != learners.end();