Skip to content

Commit cf2f8d1

Browse files
machichimamachichima
committed
refactor: from random to nil
Signed-off-by: machichima <nary12321@gmail.com>
1 parent 476f69d commit cf2f8d1

10 files changed

+24
-30
lines changed

‎src/ray/core_worker/task_execution/tests/scheduling_queue_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class MockTaskEventBuffer : public worker::TaskEventBuffer {
9292

9393
std::vector<std::unique_ptr<worker::TaskEvent>> task_events;
9494

95-
NodeID GetNodeID() const override { return NodeID::FromRandom(); }
95+
NodeID GetNodeID() const override { return NodeID::Nil(); }
9696
};
9797

9898
TEST(ActorSchedulingQueueTest, TestTaskEvents) {

‎src/ray/core_worker/task_execution/tests/task_receiver_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class MockTaskEventBuffer : public worker::TaskEventBuffer {
124124

125125
std::string GetSessionName() const override { return "test-session-name"; }
126126

127-
NodeID GetNodeID() const override { return NodeID::FromRandom(); }
127+
NodeID GetNodeID() const override { return NodeID::Nil(); }
128128
};
129129

130130
class TaskReceiverTest : public ::testing::Test {

‎src/ray/core_worker/tests/task_event_buffer_export_event_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class TaskEventTestWriteExport : public ::testing::Test {
6969
std::make_unique<ray::gcs::MockGcsClient>(),
7070
std::make_unique<MockEventAggregatorClient>(),
7171
"test_session_name",
72-
NodeID::FromRandom());
72+
NodeID::Nil());
7373
}
7474

7575
virtual void SetUp() { RAY_CHECK_OK(task_event_buffer_->Start(/*auto_flush*/ false)); }
@@ -100,7 +100,7 @@ class TaskEventTestWriteExport : public ::testing::Test {
100100
running_ts,
101101
/*is_actor_task_event=*/false,
102102
"test_session_name",
103-
NodeID::FromRandom(),
103+
NodeID::Nil(),
104104
nullptr,
105105
state_update);
106106
}

‎src/ray/core_worker/tests/task_event_buffer_test.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class TaskEventBufferTest : public ::testing::Test {
9393
std::make_unique<ray::gcs::MockGcsClient>(),
9494
std::make_unique<MockEventAggregatorClient>(),
9595
"test_session_name",
96-
NodeID::FromRandom());
96+
NodeID::Nil());
9797
}
9898

9999
virtual void SetUp() { RAY_CHECK_OK(task_event_buffer_->Start(/*auto_flush*/ false)); }
@@ -159,7 +159,7 @@ class TaskEventBufferTest : public ::testing::Test {
159159
1,
160160
/*is_actor_task_event=*/false,
161161
"test_session_name",
162-
NodeID::FromRandom(),
162+
NodeID::Nil(),
163163
std::make_shared<TaskSpecification>(task_spec),
164164
status_update);
165165
}
@@ -177,7 +177,7 @@ class TaskEventBufferTest : public ::testing::Test {
177177
running_ts,
178178
/*is_actor_task_event=*/false,
179179
"test_session_name",
180-
NodeID::FromRandom(),
180+
NodeID::Nil(),
181181
nullptr,
182182
state_update);
183183
}
@@ -192,7 +192,7 @@ class TaskEventBufferTest : public ::testing::Test {
192192
"test_event",
193193
1,
194194
"test_session_name",
195-
NodeID::FromRandom());
195+
NodeID::Nil());
196196
}
197197

198198
static void CompareTaskEventData(const rpc::TaskEventData &actual_data,
@@ -953,7 +953,7 @@ TEST_F(TaskEventBufferTest, TestTaskProfileEventToRpcRayEvents) {
953953
event_name,
954954
start_time,
955955
"test_session_name",
956-
NodeID::FromRandom());
956+
NodeID::Nil());
957957

958958
// Set end time and extra data to test full population
959959
profile_event->SetEndTime(2000);
@@ -1025,7 +1025,7 @@ TEST_F(TaskEventBufferTest, TestCreateRayEventsDataWithProfileEvents) {
10251025
"profile_test",
10261026
5000,
10271027
"test_session_name",
1028-
NodeID::FromRandom());
1028+
NodeID::Nil());
10291029
profile_event->SetEndTime(6000);
10301030

10311031
absl::flat_hash_map<TaskAttempt, RayEventsTuple> agg_ray_events;
@@ -1078,7 +1078,7 @@ TEST_P(TaskEventBufferTestDifferentDestination,
10781078
"mixed_test",
10791079
7000,
10801080
"test_session_name",
1081-
NodeID::FromRandom());
1081+
NodeID::Nil());
10821082
// Expect data flushed match. Generate the expected data
10831083
rpc::TaskEventData expected_task_event_data;
10841084
rpc::events::RayEventsData expected_ray_events_data;

‎src/ray/gcs/tests/export_api/gcs_actor_manager_export_event_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class GcsActorManagerTest : public ::testing::Test {
171171
});
172172
worker_client_pool_ = std::make_unique<rpc::CoreWorkerClientPool>(
173173
[this](const rpc::Address &address) { return worker_client_; });
174-
gcs_node_id_ = NodeID::FromRandom();
174+
gcs_node_id_ = NodeID::Nil();
175175
gcs_actor_manager_ = std::make_unique<gcs::GcsActorManager>(
176176
std::move(actor_scheduler),
177177
gcs_table_storage_.get(),

‎src/ray/gcs/tests/export_api/gcs_job_manager_export_event_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ TEST_F(GcsJobManagerTest, TestRayEventDriverJobEvents) {
9898
"enable_ray_event": true
9999
}
100100
)");
101-
auto gcs_node_id = NodeID::FromRandom();
101+
auto gcs_node_id = NodeID::Nil();
102102
gcs::GcsJobManager gcs_job_manager(*gcs_table_storage_,
103103
*gcs_publisher_,
104104
runtime_env_manager_,
@@ -150,7 +150,7 @@ TEST_F(GcsJobManagerTest, TestExportDriverJobEvents) {
150150
log_dir_,
151151
"warning",
152152
false);
153-
auto gcs_node_id = NodeID::FromRandom();
153+
auto gcs_node_id = NodeID::Nil();
154154
gcs::GcsJobManager gcs_job_manager(*gcs_table_storage_,
155155
*gcs_publisher_,
156156
runtime_env_manager_,

‎src/ray/gcs/tests/export_api/gcs_node_manager_export_event_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class GcsNodeManagerExportAPITest : public ::testing::Test {
8787
TEST_F(GcsNodeManagerExportAPITest, TestExportEventRegisterNode) {
8888
// Test export event is written when a node is added with HandleRegisterNode
8989
observability::FakeRayEventRecorder fake_ray_event_recorder;
90-
auto gcs_node_id = NodeID::FromRandom();
90+
auto gcs_node_id = NodeID::Nil();
9191
gcs::GcsNodeManager node_manager(gcs_publisher_.get(),
9292
gcs_table_storage_.get(),
9393
io_service_,
@@ -117,7 +117,7 @@ TEST_F(GcsNodeManagerExportAPITest, TestExportEventRegisterNode) {
117117
TEST_F(GcsNodeManagerExportAPITest, TestExportEventUnregisterNode) {
118118
// Test export event is written when a node is removed with HandleUnregisterNode
119119
observability::FakeRayEventRecorder fake_ray_event_recorder;
120-
auto gcs_node_id = NodeID::FromRandom();
120+
auto gcs_node_id = NodeID::Nil();
121121
gcs::GcsNodeManager node_manager(gcs_publisher_.get(),
122122
gcs_table_storage_.get(),
123123
io_service_,

‎src/ray/gcs/tests/gcs_actor_manager_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class GcsActorManagerTest : public ::testing::Test {
147147
worker_client_pool_ = std::make_unique<rpc::CoreWorkerClientPool>(
148148
[this](const rpc::Address &address) { return worker_client_; });
149149
fake_ray_event_recorder_ = std::make_unique<observability::FakeRayEventRecorder>();
150-
gcs_node_id_ = NodeID::FromRandom();
150+
gcs_node_id_ = NodeID::Nil();
151151
gcs_actor_manager_ = std::make_unique<gcs::GcsActorManager>(
152152
std::move(scheduler),
153153
gcs_table_storage_.get(),

‎src/ray/gcs/tests/gcs_job_manager_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class GcsJobManagerTest : public ::testing::Test {
5959
address.port());
6060
});
6161
fake_ray_event_recorder_ = std::make_unique<observability::FakeRayEventRecorder>();
62-
gcs_node_id_ = NodeID::FromRandom();
62+
gcs_node_id_ = NodeID::Nil();
6363
gcs_job_manager_ =
6464
std::make_unique<gcs::GcsJobManager>(*gcs_table_storage_,
6565
*gcs_publisher_,

‎src/ray/gcs/tests/gcs_node_manager_test.cc‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,14 @@ TEST_F(GcsNodeManagerTest, TestRayEventNodeEvents) {
170170
}
171171

172172
TEST_F(GcsNodeManagerTest, TestManagement) {
173-
auto gcs_node_id = NodeID::FromRandom();
174173
gcs::GcsNodeManager node_manager(gcs_publisher_.get(),
175174
gcs_table_storage_.get(),
176175
*io_context_,
177176
client_pool_.get(),
178177
ClusterID::Nil(),
179178
*fake_ray_event_recorder_,
180179
"test_session_name",
181-
gcs_node_id);
180+
NodeID::Nil());
182181
// Test Add/Get/Remove functionality.
183182
auto node = GenNodeInfo();
184183
auto node_id = NodeID::FromBinary(node->node_id());
@@ -192,15 +191,14 @@ TEST_F(GcsNodeManagerTest, TestManagement) {
192191
}
193192

194193
TEST_F(GcsNodeManagerTest, TestListener) {
195-
auto gcs_node_id = NodeID::FromRandom();
196194
gcs::GcsNodeManager node_manager(gcs_publisher_.get(),
197195
gcs_table_storage_.get(),
198196
*io_context_,
199197
client_pool_.get(),
200198
ClusterID::Nil(),
201199
*fake_ray_event_recorder_,
202200
"test_session_name",
203-
gcs_node_id);
201+
NodeID::Nil());
204202
// Test AddNodeAddedListener.
205203
int node_count = 1000;
206204
std::atomic_int callbacks_remaining = node_count;
@@ -268,15 +266,14 @@ TEST_F(GcsNodeManagerTest, TestListener) {
268266
// state remains consistent. This validates the "post-notify" approach.
269267

270268
TEST_F(GcsNodeManagerTest, TestAddNodeListenerCallbackDeadlock) {
271-
auto gcs_node_id = NodeID::FromRandom();
272269
gcs::GcsNodeManager node_manager(gcs_publisher_.get(),
273270
gcs_table_storage_.get(),
274271
*io_context_,
275272
client_pool_.get(),
276273
ClusterID::Nil(),
277274
*fake_ray_event_recorder_,
278275
"test_session_name",
279-
gcs_node_id);
276+
NodeID::Nil());
280277
int node_count = 10;
281278
std::atomic_int callbacks_remaining = node_count;
282279
node_manager.AddNodeAddedListener(
@@ -301,15 +298,14 @@ TEST_F(GcsNodeManagerTest, TestAddNodeListenerCallbackDeadlock) {
301298
}
302299

303300
TEST_F(GcsNodeManagerTest, TestUpdateAliveNode) {
304-
auto gcs_node_id = NodeID::FromRandom();
305301
gcs::GcsNodeManager node_manager(gcs_publisher_.get(),
306302
gcs_table_storage_.get(),
307303
*io_context_,
308304
client_pool_.get(),
309305
ClusterID::Nil(),
310306
*fake_ray_event_recorder_,
311307
"test_session_name",
312-
gcs_node_id);
308+
NodeID::Nil());
313309

314310
// Create a test node
315311
auto node = GenNodeInfo();
@@ -382,15 +378,14 @@ TEST_F(GcsNodeManagerTest, TestUpdateAliveNode) {
382378
}
383379

384380
TEST_F(GcsNodeManagerTest, TestGetNodeAddressAndLiveness) {
385-
auto gcs_node_id = NodeID::FromRandom();
386381
gcs::GcsNodeManager node_manager(gcs_publisher_.get(),
387382
gcs_table_storage_.get(),
388383
*io_context_,
389384
client_pool_.get(),
390385
ClusterID::Nil(),
391386
*fake_ray_event_recorder_,
392387
"test_session_name",
393-
gcs_node_id);
388+
NodeID::Nil());
394389

395390
// Create and add a test node
396391
auto node = GenNodeInfo();
@@ -423,15 +418,14 @@ TEST_F(GcsNodeManagerTest, TestGetNodeAddressAndLiveness) {
423418
}
424419

425420
TEST_F(GcsNodeManagerTest, TestHandleGetAllNodeAddressAndLiveness) {
426-
auto gcs_node_id = NodeID::FromRandom();
427421
gcs::GcsNodeManager node_manager(gcs_publisher_.get(),
428422
gcs_table_storage_.get(),
429423
*io_context_,
430424
client_pool_.get(),
431425
ClusterID::Nil(),
432426
*fake_ray_event_recorder_,
433427
"test_session_name",
434-
gcs_node_id);
428+
NodeID::Nil());
435429

436430
// Add multiple alive nodes
437431
std::vector<std::shared_ptr<rpc::GcsNodeInfo>> alive_nodes;

0 commit comments

Comments
 (0)