From 4bff702e7bd2ca69e1e37dc25e6e91ab4af93f89 Mon Sep 17 00:00:00 2001 From: Yi Cheng <74173148+iycheng@users.noreply.github.com> Date: Tue, 30 Aug 2022 22:26:57 +0000 Subject: [PATCH] [deflakey] Deflakey gcs_heartbeat_manager_test (#28142) The heartbeat check is every seconds, so it could happen < 1s, which means it could happen very soon. This PR decrease the check period. --- .../test/gcs_heartbeat_manager_test.cc | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ray/gcs/gcs_server/test/gcs_heartbeat_manager_test.cc b/src/ray/gcs/gcs_server/test/gcs_heartbeat_manager_test.cc index 3567649a3..f7549f5dc 100644 --- a/src/ray/gcs/gcs_server/test/gcs_heartbeat_manager_test.cc +++ b/src/ray/gcs/gcs_server/test/gcs_heartbeat_manager_test.cc @@ -29,8 +29,8 @@ class GcsHeartbeatManagerTest : public ::testing::Test { RayConfig::instance().initialize( R"( { - "num_heartbeats_timeout": 2, - "gcs_failover_worker_reconnect_timeout": 4 + "num_heartbeats_timeout": 3, + "gcs_failover_worker_reconnect_timeout": 5 } )"); } @@ -68,13 +68,13 @@ TEST_F(GcsHeartbeatManagerTest, TestBasicTimeout) { while (true) { absl::MutexLock lock(&mutex_); - if (absl::Now() - start >= absl::Seconds(1)) { + if (absl::Now() - start >= absl::Microseconds(1800)) { break; } ASSERT_TRUE(dead_nodes.empty()); } - std::this_thread::sleep_for(2s); + std::this_thread::sleep_for(3s); { absl::MutexLock lock(&mutex_); @@ -89,7 +89,7 @@ TEST_F(GcsHeartbeatManagerTest, TestBasicReport) { while (true) { absl::MutexLock lock(&mutex_); - if (absl::Now() - start >= absl::Seconds(3)) { + if (absl::Now() - start >= absl::Seconds(4)) { break; } ASSERT_TRUE(dead_nodes.empty()); @@ -124,13 +124,13 @@ TEST_F(GcsHeartbeatManagerTest, TestBasicRestart) { while (true) { absl::MutexLock lock(&mutex_); - if (absl::Now() - start >= absl::Seconds(3)) { + if (absl::Now() - start >= absl::Seconds(4)) { break; } ASSERT_TRUE(dead_nodes.empty()); } - std::this_thread::sleep_for(2s); + std::this_thread::sleep_for(3s); { absl::MutexLock lock(&mutex_); ASSERT_EQ(std::vector{node_1}, dead_nodes); @@ -153,7 +153,7 @@ TEST_F(GcsHeartbeatManagerTest, TestBasicRestart2) { heartbeat_manager->Initialize(init_data); - while (absl::Now() - start < absl::Seconds(1)) { + while (absl::Now() - start < absl::Seconds(2)) { io_service.post( [&]() { rpc::ReportHeartbeatReply reply; @@ -169,13 +169,13 @@ TEST_F(GcsHeartbeatManagerTest, TestBasicRestart2) { while (true) { absl::MutexLock lock(&mutex_); - if (absl::Now() - start >= absl::Seconds(1)) { + if (absl::Now() - start >= absl::Seconds(2)) { break; } ASSERT_TRUE(dead_nodes.empty()); } - std::this_thread::sleep_for(2s); + std::this_thread::sleep_for(3s); { absl::MutexLock lock(&mutex_); ASSERT_EQ(std::vector{node_1}, dead_nodes);