fix(shell)

Author: Samunroyu

src/meta/meta_data.h

@@ -549,6 +549,41 @@ inline int count_partitions(const app_mapper &apps)
 
 void when_update_replicas(config_type::type t, const std::function<void(bool)> &func);
 
+#define MAINTAIN_DROP_NODE_IMPL(config, node_value, drops_field, type) \
+    do { \
+        auto action = [&](bool is_adding) { \
+            auto it = std::find(config.drops_field.begin(), config.drops_field.end(), node_value); \
+            if (is_adding) { \
+                if (it != config.drops_field.end()) { \
+                    config.drops_field.erase(it); \
+                } \
+            } else { \
+                CHECK(it == config.drops_field.end(), \
+                      "the node({}) cannot be in drops set before this update", node_value); \
+                config.drops_field.push_back(node_value); \
+                if (config.drops_field.size() > 3) { \
+                    config.drops_field.erase(config.drops_field.begin()); \
+                } \
+            } \
+        }; \
+        when_update_replicas(type, action); \
+    } while (0)
+
+#define MAINTAIN_DROP_NODE(config, node, drops_field, type) \
+    do { \
+        if (config.node) { \
+            MAINTAIN_DROP_NODE_IMPL(config, config.node, drops_field, type); \
+        } \
+    } while (0)
+
+
+#define MAINTAIN_DROP_NODES(config, nodes, drops_field, type) \
+    do { \
+        for (const auto &secondary : config.nodes) { \
+            MAINTAIN_DROP_NODE_IMPL(config, secondary, drops_field, type); \
+        } \
+    } while (0)
+    
 inline void maintain_drops(/*inout*/ configuration_update_request &request, partition_configuration &pc, bool is_group_check)
 {
     auto t = request.type;

src/meta/server_state.cpp

@@ -2095,8 +2095,10 @@ void server_state::drop_partition(std::shared_ptr<app_state> &app, int pidx)
     request.type = config_type::CT_DROP_PARTITION;
     SET_OBJ_IP_AND_HOST_PORT(request, node, pc, primary);
 
-    maintain_drops(request, pc, true);
-    maintain_drops(request, pc, false);
+    MAINTAIN_DROP_NODES(request.config, hp_secondaries, hp_last_drops, request.type);
+    MAINTAIN_DROP_NODES(request.config, secondaries, last_drops, request.type);
+    MAINTAIN_DROP_NODE(request.config, hp_primary, hp_last_drops, request.type);
+    MAINTAIN_DROP_NODE(request.config, primary, last_drops, request.type);
 
     RESET_IP_AND_HOST_PORT(request.config, primary);
     CLEAR_IP_AND_HOST_PORT(request.config, secondaries);
@@ -2158,7 +2160,9 @@ void server_state::downgrade_primary_to_inactive(std::shared_ptr<app_state> &app
     SET_OBJ_IP_AND_HOST_PORT(request, node, pc, primary);
     request.config.ballot++;
     RESET_IP_AND_HOST_PORT(request.config, primary);
-    maintain_drops(request, pc, false);
+    MAINTAIN_DROP_NODE(request.config, hp_primary, hp_last_drops, request.type);
+    MAINTAIN_DROP_NODE(request.config, primary, last_drops, request.type);
+    // maintain_drops(request, pc, false);
 
     cc.stage = config_status::pending_remote_sync;
     cc.pending_sync_request = req;
@@ -2295,12 +2299,8 @@ void server_state::on_update_configuration(
         msg->release_ref();
         return;
     } else {
-        partition_configuration pc;
-        pc.hp_primary = cfg_request->hp_node;
-        pc.primary = cfg_request->node;
-        pc.hp_secondaries = cfg_request->config.hp_secondaries;
-        pc.secondaries = cfg_request->config.secondaries;
-        maintain_drops(*cfg_request, pc, false);
+        MAINTAIN_DROP_NODES(cfg_request->config, hp_node, hp_last_drops, cfg_request->type);
+        MAINTAIN_DROP_NODES(cfg_request->config, node, last_drops, cfg_request->type);
     }
 
     if (response.err != ERR_IO_PENDING) {