This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new 29396983d refactor(FQDN): Update idl/replica_admin.thrift related code
(#1988)
29396983d is described below
commit 29396983d9c6c9d7397b20c000bfa8ef551afded
Author: Yingchun Lai <[email protected]>
AuthorDate: Sun Apr 28 11:15:40 2024 +0800
refactor(FQDN): Update idl/replica_admin.thrift related code (#1988)
---
idl/replica_admin.thrift | 12 +++++++-----
src/client/replication_ddl_client.cpp | 3 +--
src/meta/server_state.cpp | 4 ++--
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/idl/replica_admin.thrift b/idl/replica_admin.thrift
index 122c6f654..6eac30e07 100644
--- a/idl/replica_admin.thrift
+++ b/idl/replica_admin.thrift
@@ -33,8 +33,9 @@ namespace go radmin
struct query_replica_decree_request
{
- 1:dsn.gpid pid;
- 2:dsn.rpc_address node;
+ 1:dsn.gpid pid;
+ 2:dsn.rpc_address node1;
+ 3:optional dsn.host_port hp_node1;
}
struct query_replica_decree_response
@@ -45,7 +46,8 @@ struct query_replica_decree_response
struct query_replica_info_request
{
- 1:dsn.rpc_address node;
+ 1:dsn.rpc_address node1;
+ 2:optional dsn.host_port hp_node1;
}
struct query_replica_info_response
@@ -68,9 +70,9 @@ struct disk_info
// This request is sent from client to replica_server.
struct query_disk_info_request
{
- 1:dsn.rpc_address node;
+ 1:dsn.rpc_address node1;
2:string app_name;
- 3:optional dsn.host_port hp_node;
+ 3:optional dsn.host_port hp_node1;
}
// This response is from replica_server to client.
diff --git a/src/client/replication_ddl_client.cpp
b/src/client/replication_ddl_client.cpp
index 5932b813d..3e8ba5979 100644
--- a/src/client/replication_ddl_client.cpp
+++ b/src/client/replication_ddl_client.cpp
@@ -1585,8 +1585,7 @@ void replication_ddl_client::query_disk_info(
std::map<dsn::host_port, query_disk_info_rpc> query_disk_info_rpcs;
for (const auto &target : targets) {
auto request = std::make_unique<query_disk_info_request>();
- request->node = dsn::dns_resolver::instance().resolve_address(target);
- request->__set_hp_node(target);
+ SET_IP_AND_HOST_PORT_BY_DNS(*request, node1, target);
request->app_name = app_name;
query_disk_info_rpcs.emplace(target,
query_disk_info_rpc(std::move(request),
RPC_QUERY_DISK_INFO));
diff --git a/src/meta/server_state.cpp b/src/meta/server_state.cpp
index 2140105af..09dc7781b 100644
--- a/src/meta/server_state.cpp
+++ b/src/meta/server_state.cpp
@@ -2309,7 +2309,7 @@ server_state::sync_apps_from_replica_nodes(const
std::vector<dsn::host_port> &re
SET_IP_AND_HOST_PORT(
*app_query_req, meta_server, dsn_primary_address(),
dsn_primary_host_port());
query_app_info_rpc app_rpc(std::move(app_query_req),
RPC_QUERY_APP_INFO);
- const auto &addr =
dsn::dns_resolver::instance().resolve_address(replica_nodes[i]);
+ const auto addr =
dsn::dns_resolver::instance().resolve_address(replica_nodes[i]);
app_rpc.call(addr,
&tracker,
[app_rpc, i, &replica_nodes, &query_app_errors,
&query_app_responses](
@@ -2327,7 +2327,7 @@ server_state::sync_apps_from_replica_nodes(const
std::vector<dsn::host_port> &re
});
auto replica_query_req =
std::make_unique<query_replica_info_request>();
- replica_query_req->node = addr;
+ SET_IP_AND_HOST_PORT_BY_DNS(*replica_query_req, node1,
replica_nodes[i]);
query_replica_info_rpc replica_rpc(std::move(replica_query_req),
RPC_QUERY_REPLICA_INFO);
replica_rpc.call(
addr,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
