From a73072b0faae911ae63810f4ab627e6156c67ba5 Mon Sep 17 00:00:00 2001 From: Yingchun Lai Date: Tue, 20 Dec 2022 15:37:01 +0800 Subject: [PATCH] remove_deprecated__host_node --- idl/meta_admin.thrift | 2 +- src/meta/server_state.cpp | 51 ++++++++++--------- .../test/meta_partition_guardian_test.cpp | 2 +- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/idl/meta_admin.thrift b/idl/meta_admin.thrift index f24a1834ba..836f0dba71 100644 --- a/idl/meta_admin.thrift +++ b/idl/meta_admin.thrift @@ -69,7 +69,7 @@ struct configuration_update_request 2:dsn.layer2.partition_configuration config; 3:config_type type = config_type.CT_INVALID; 4:dsn.rpc_address node; - 5:dsn.rpc_address host_node; // deprecated, only used by stateless apps + 5:dsn.rpc_address deprecated__host_node; // deprecated, only used by stateless apps // Used for partition split // if replica is splitting (whose split_status is not NOT_SPLIT) diff --git a/src/meta/server_state.cpp b/src/meta/server_state.cpp index 8751d6b3f5..e6524a4963 100644 --- a/src/meta/server_state.cpp +++ b/src/meta/server_state.cpp @@ -829,7 +829,7 @@ void server_state::on_config_sync(configuration_query_by_node_rpc rpc) response.partitions[i].info = *app; response.partitions[i].config = app->partitions[pid.get_partition_index()]; - response.partitions[i].host_node = request.node; +// response.partitions[i].host_node = request.node; // set meta_split_status const split_state &app_split_states = app->helpers->split_states; if (app->splitting()) { @@ -1567,27 +1567,27 @@ void server_state::update_configuration_locally( } else { CHECK_EQ(old_cfg.ballot, new_cfg.ballot); - new_cfg = old_cfg; - partition_configuration_stateless pcs(new_cfg); - if (config_request->type == config_type::type::CT_ADD_SECONDARY) { - pcs.hosts().emplace_back(config_request->host_node); - pcs.workers().emplace_back(config_request->node); - } else { - auto it = - std::remove(pcs.hosts().begin(), pcs.hosts().end(), config_request->host_node); - pcs.hosts().erase(it); - - it = std::remove(pcs.workers().begin(), pcs.workers().end(), config_request->node); - pcs.workers().erase(it); - } - - auto it = _nodes.find(config_request->host_node); - CHECK(it != _nodes.end(), "invalid node address, address = {}", config_request->host_node); - if (config_type::CT_REMOVE == config_request->type) { - it->second.remove_partition(gpid, false); - } else { - it->second.put_partition(gpid, false); - } +// new_cfg = old_cfg; +// partition_configuration_stateless pcs(new_cfg); +// if (config_request->type == config_type::type::CT_ADD_SECONDARY) { +// pcs.hosts().emplace_back(config_request->host_node); +// pcs.workers().emplace_back(config_request->node); +// } else { +// auto it = +// std::remove(pcs.hosts().begin(), pcs.hosts().end(), config_request->host_node); +// pcs.hosts().erase(it); +// +// it = std::remove(pcs.workers().begin(), pcs.workers().end(), config_request->node); +// pcs.workers().erase(it); +// } +// +// auto it = _nodes.find(config_request->host_node); +// CHECK(it != _nodes.end(), "invalid node address, address = {}", config_request->host_node); +// if (config_type::CT_REMOVE == config_request->type) { +// it->second.remove_partition(gpid, false); +// } else { +// it->second.put_partition(gpid, false); +// } } // we assume config in config_request stores the proper new config @@ -1860,6 +1860,7 @@ void server_state::downgrade_secondary_to_inactive(std::shared_ptr &a } } +// TODO: remove the function totally? void server_state::downgrade_stateless_nodes(std::shared_ptr &app, int pidx, const rpc_address &address) @@ -1868,7 +1869,7 @@ void server_state::downgrade_stateless_nodes(std::shared_ptr &app, std::make_shared(); req->info = *app; req->type = config_type::CT_REMOVE; - req->host_node = address; +// req->host_node = address; req->node.set_invalid(); req->config = app->partitions[pidx]; @@ -1893,10 +1894,10 @@ void server_state::downgrade_stateless_nodes(std::shared_ptr &app, if (config_status::pending_remote_sync == cc.stage) { LOG_WARNING("gpid(%d.%d) is syncing another request with remote, cancel it due to meta is " - "removing host(%s) worker(%s)", + "removing host() worker(%s)", pc.pid.get_app_id(), pc.pid.get_partition_index(), - req->host_node.to_string(), +// req->host_node.to_string(), req->node.to_string()); cc.cancel_sync(); } diff --git a/src/meta/test/meta_partition_guardian_test.cpp b/src/meta/test/meta_partition_guardian_test.cpp index 47fe17352a..2840820d9b 100644 --- a/src/meta/test/meta_partition_guardian_test.cpp +++ b/src/meta/test/meta_partition_guardian_test.cpp @@ -800,7 +800,7 @@ void meta_partition_guardian_test::cure() fake_request.config = the_app->partitions[i]; fake_request.type = action.type; fake_request.node = action.node; - fake_request.host_node = action.node; +// fake_request.host_node = action.node; guardian.reconfig({&app, &nodes}, fake_request); check_nodes_loads(nodes);