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 cf8a187f6 refactor(FQDN): Resolve IP from from host:port in tests to
keep consistent (#1950)
cf8a187f6 is described below
commit cf8a187f6978c54d1a44b6776009f4faa189caa2
Author: Yingchun Lai <[email protected]>
AuthorDate: Fri Apr 12 18:07:46 2024 +0800
refactor(FQDN): Resolve IP from from host:port in tests to keep consistent
(#1950)
---
src/meta/duplication/meta_duplication_service.cpp | 22 ++++++++++++++-------
src/meta/test/meta_bulk_load_service_test.cpp | 10 ++++++----
src/meta/test/meta_split_service_test.cpp | 3 ++-
src/meta/test/misc/misc.cpp | 4 ++--
src/meta/test/misc/misc.h | 8 +++++---
.../duplication/test/replica_follower_test.cpp | 23 ++++++++++++++--------
src/replica/split/test/replica_split_test.cpp | 8 +++++---
7 files changed, 50 insertions(+), 28 deletions(-)
diff --git a/src/meta/duplication/meta_duplication_service.cpp
b/src/meta/duplication/meta_duplication_service.cpp
index ef75c20f7..8c05db6dc 100644
--- a/src/meta/duplication/meta_duplication_service.cpp
+++ b/src/meta/duplication/meta_duplication_service.cpp
@@ -513,14 +513,22 @@ void
meta_duplication_service::check_follower_app_if_create_completed(
err = ERR_OK;
int count = dup->partition_count;
while (count-- > 0) {
+ const host_port primary("localhost", 34801);
+ const host_port secondary1("localhost", 34802);
+ const host_port secondary2("localhost", 34803);
+
partition_configuration p;
- p.primary = rpc_address::from_ip_port("127.0.0.1",
34801);
-
p.secondaries.emplace_back(rpc_address::from_ip_port("127.0.0.2", 34801));
-
p.secondaries.emplace_back(rpc_address::from_ip_port("127.0.0.3", 34801));
- p.__set_hp_primary(host_port("localhost", 34801));
- p.__set_hp_secondaries(std::vector<host_port>());
- p.hp_secondaries.emplace_back(host_port("localhost",
34802));
- p.hp_secondaries.emplace_back(host_port("localhost",
34803));
+ p.primary =
dsn::dns_resolver::instance().resolve_address(primary);
+ p.secondaries.emplace_back(
+
dsn::dns_resolver::instance().resolve_address(secondary1));
+ p.secondaries.emplace_back(
+
dsn::dns_resolver::instance().resolve_address(secondary2));
+
+ p.__set_hp_primary(primary);
+ p.__set_hp_secondaries({});
+ p.hp_secondaries.emplace_back(secondary1);
+ p.hp_secondaries.emplace_back(secondary2);
+
resp.partitions.emplace_back(p);
}
});
diff --git a/src/meta/test/meta_bulk_load_service_test.cpp
b/src/meta/test/meta_bulk_load_service_test.cpp
index 331a4a0d2..dedb28d73 100644
--- a/src/meta/test/meta_bulk_load_service_test.cpp
+++ b/src/meta/test/meta_bulk_load_service_test.cpp
@@ -49,6 +49,7 @@
#include "meta_service_test_app.h"
#include "meta_test_base.h"
#include "metadata_types.h"
+#include "runtime/rpc/dns_resolver.h"
#include "runtime/rpc/rpc_address.h"
#include "runtime/rpc/rpc_host_port.h"
#include "utils/blob.h"
@@ -518,15 +519,16 @@ public:
std::string PROVIDER = "local_service";
std::string ROOT_PATH = "bulk_load_root";
int64_t BALLOT = 4;
- const rpc_address PRIMARY = rpc_address::from_ip_port("127.0.0.1", 10086);
- const rpc_address SECONDARY1 = rpc_address::from_ip_port("127.0.0.1",
10085);
- const rpc_address SECONDARY2 = rpc_address::from_ip_port("127.0.0.1",
10087);
- const rpc_address SECONDARY3 = rpc_address::from_ip_port("127.0.0.1",
10080);
const host_port PRIMARY_HP = host_port("localhost", 10086);
const host_port SECONDARY1_HP = host_port("localhost", 10085);
const host_port SECONDARY2_HP = host_port("localhost", 10087);
const host_port SECONDARY3_HP = host_port("localhost", 10080);
+
+ const rpc_address PRIMARY =
dsn::dns_resolver::instance().resolve_address(PRIMARY_HP);
+ const rpc_address SECONDARY1 =
dsn::dns_resolver::instance().resolve_address(SECONDARY1_HP);
+ const rpc_address SECONDARY2 =
dsn::dns_resolver::instance().resolve_address(SECONDARY2_HP);
+ const rpc_address SECONDARY3 =
dsn::dns_resolver::instance().resolve_address(SECONDARY3_HP);
};
/// start bulk load unit tests
diff --git a/src/meta/test/meta_split_service_test.cpp
b/src/meta/test/meta_split_service_test.cpp
index 420066d8e..bf816f773 100644
--- a/src/meta/test/meta_split_service_test.cpp
+++ b/src/meta/test/meta_split_service_test.cpp
@@ -59,6 +59,7 @@
#include "meta_test_base.h"
#include "metadata_types.h"
#include "partition_split_types.h"
+#include "runtime/rpc/dns_resolver.h"
#include "runtime/rpc/rpc_address.h"
#include "runtime/rpc/rpc_host_port.h"
#include "utils/blob.h"
@@ -379,7 +380,7 @@ public:
const int32_t PARENT_INDEX = 0;
const int32_t CHILD_INDEX = 4;
const host_port NODE = host_port("localhost", 10086);
- const rpc_address NODE_ADDR = rpc_address::from_host_port("127.0.0.1",
10086);
+ const rpc_address NODE_ADDR =
dsn::dns_resolver::instance().resolve_address(NODE);
std::shared_ptr<app_state> app;
};
diff --git a/src/meta/test/misc/misc.cpp b/src/meta/test/misc/misc.cpp
index 8e57ba1d1..6037e1605 100644
--- a/src/meta/test/misc/misc.cpp
+++ b/src/meta/test/misc/misc.cpp
@@ -68,8 +68,8 @@ void generate_node_list(std::vector<std::pair<dsn::host_port,
dsn::rpc_address>>
const auto count = random32(min_count, max_count);
output_list.resize(count);
for (int i = 0; i < count; ++i) {
- output_list[i] = std::make_pair(dsn::host_port("localhost", i + 1),
-
dsn::rpc_address::from_ip_port("127.0.0.1", i + 1));
+ const dsn::host_port hp("localhost", i + 1);
+ output_list[i] = std::make_pair(hp,
dsn::dns_resolver::instance().resolve_address(hp));
}
}
diff --git a/src/meta/test/misc/misc.h b/src/meta/test/misc/misc.h
index 867b49781..917f4cd8e 100644
--- a/src/meta/test/misc/misc.h
+++ b/src/meta/test/misc/misc.h
@@ -33,10 +33,12 @@
#include <functional>
#include <map>
#include <memory>
+#include <string>
#include <utility>
#include <vector>
#include "meta/meta_data.h"
+#include "runtime/rpc/dns_resolver.h"
#include "runtime/rpc/rpc_address.h"
#include "runtime/rpc/rpc_host_port.h"
@@ -77,9 +79,9 @@ generate_node_list(size_t size, int start_port = 12321)
std::vector<std::pair<dsn::host_port, dsn::rpc_address>> result;
result.resize(size);
for (int i = 0; i < size; ++i) {
- result[i].first = dsn::host_port("localhost",
static_cast<uint16_t>(start_port + i + 1));
- result[i].second =
- dsn::rpc_address::from_ip_port("127.0.0.1",
static_cast<uint16_t>(start_port + i + 1));
+ const dsn::host_port hp("localhost", static_cast<uint16_t>(start_port
+ i + 1));
+ result[i].first = hp;
+ result[i].second = dsn::dns_resolver::instance().resolve_address(hp);
}
return result;
}
diff --git a/src/replica/duplication/test/replica_follower_test.cpp
b/src/replica/duplication/test/replica_follower_test.cpp
index 5affa27d9..52415f6d2 100644
--- a/src/replica/duplication/test/replica_follower_test.cpp
+++ b/src/replica/duplication/test/replica_follower_test.cpp
@@ -32,6 +32,7 @@
#include "nfs/nfs_node.h"
#include "replica/duplication/replica_follower.h"
#include "replica/test/mock_utils.h"
+#include "runtime/rpc/dns_resolver.h"
#include "runtime/rpc/rpc_address.h"
#include "runtime/rpc/rpc_host_port.h"
#include "runtime/task/task_tracker.h"
@@ -250,13 +251,18 @@ TEST_P(replica_follower_test,
test_update_master_replica_config)
resp.partitions.clear();
p.pid = gpid(2, 1);
- p.primary = rpc_address::from_ip_port("127.0.0.1", 34801);
- p.__set_hp_primary(host_port("localhost", 34801));
- p.secondaries.emplace_back(rpc_address::from_ip_port("127.0.0.1", 34802));
- p.secondaries.emplace_back(rpc_address::from_ip_port("127.0.0.1", 34803));
+
+ const host_port primary("localhost", 34801);
+ const host_port secondary1("localhost", 34802);
+ const host_port secondary2("localhost", 34803);
+
+ p.primary = dsn::dns_resolver::instance().resolve_address(primary);
+
p.secondaries.emplace_back(dsn::dns_resolver::instance().resolve_address(secondary1));
+
p.secondaries.emplace_back(dsn::dns_resolver::instance().resolve_address(secondary2));
+ p.__set_hp_primary(primary);
p.__set_hp_secondaries({});
- p.hp_secondaries.emplace_back(host_port("localhost", 34802));
- p.hp_secondaries.emplace_back(host_port("localhost", 34803));
+ p.hp_secondaries.emplace_back(secondary1);
+ p.hp_secondaries.emplace_back(secondary2);
resp.partitions.emplace_back(p);
ASSERT_EQ(update_master_replica_config(follower, resp), ERR_OK);
ASSERT_EQ(master_replica_config(follower).primary, p.primary);
@@ -277,8 +283,9 @@ TEST_P(replica_follower_test, test_nfs_copy_checkpoint)
ASSERT_EQ(nfs_copy_checkpoint(follower, ERR_CORRUPTION, learn_response()),
ERR_CORRUPTION);
auto resp = learn_response();
- resp.learnee = rpc_address::from_ip_port("127.0.0.1", 34801);
- resp.__set_hp_learnee(host_port("localhost", 34801));
+ const host_port learnee("localhost", 34801);
+ resp.learnee = dsn::dns_resolver::instance().resolve_address(learnee);
+ resp.__set_hp_learnee(learnee);
std::string dest = utils::filesystem::path_combine(
_mock_replica->dir(),
duplication_constants::kDuplicationCheckpointRootDir);
diff --git a/src/replica/split/test/replica_split_test.cpp
b/src/replica/split/test/replica_split_test.cpp
index 2821d902e..ce45f5448 100644
--- a/src/replica/split/test/replica_split_test.cpp
+++ b/src/replica/split/test/replica_split_test.cpp
@@ -40,6 +40,7 @@
#include "replica/split/replica_split_manager.h"
#include "replica/test/mock_utils.h"
#include "replica/test/replica_test_base.h"
+#include "runtime/rpc/dns_resolver.h"
#include "runtime/rpc/rpc_address.h"
#include "runtime/rpc/rpc_host_port.h"
#include "runtime/task/task.h"
@@ -535,12 +536,13 @@ public:
const int32_t APP_ID = 2;
const int32_t OLD_PARTITION_COUNT = 8;
const int32_t NEW_PARTITION_COUNT = 16;
+
const host_port PRIMARY = host_port("localhost", 18230);
- const rpc_address PRIMARY_ADDR = rpc_address::from_ip_port("127.0.0.1",
18230);
+ const rpc_address PRIMARY_ADDR =
dsn::dns_resolver::instance().resolve_address(PRIMARY);
const host_port SECONDARY = host_port("localhost", 10058);
- const rpc_address SECONDARY_ADDR = rpc_address::from_ip_port("127.0.0.1",
10058);
+ const rpc_address SECONDARY_ADDR =
dsn::dns_resolver::instance().resolve_address(SECONDARY);
const host_port SECONDARY2 = host_port("localhost", 10805);
- const rpc_address SECONDARY_ADDR2 = rpc_address::from_ip_port("127.0.0.1",
10805);
+ const rpc_address SECONDARY_ADDR2 =
dsn::dns_resolver::instance().resolve_address(SECONDARY2);
const gpid PARENT_GPID = gpid(APP_ID, 1);
const gpid CHILD_GPID = gpid(APP_ID, 9);
const ballot INIT_BALLOT = 3;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
