Skip to content

Commit 8539a97

Browse files
authored
[core] Partially split raylet target (#51819)
Signed-off-by: dentiny <[email protected]>
1 parent 235bfc6 commit 8539a97

File tree

3 files changed

+108
-19
lines changed

3 files changed

+108
-19
lines changed

BUILD.bazel

+107-14
Original file line numberDiff line numberDiff line change
@@ -1189,40 +1189,128 @@ ray_cc_library(
11891189
],
11901190
)
11911191

1192+
ray_cc_library(
1193+
name = "raylet_agent_manager",
1194+
hdrs = ["src/ray/raylet/agent_manager.h"],
1195+
srcs = ["src/ray/raylet/agent_manager.cc"],
1196+
deps = [
1197+
"//src/ray/common:id",
1198+
"//src/ray/common:ray_config",
1199+
"//src/ray/util:process",
1200+
"//src/ray/util:event",
1201+
"//src/ray/util:logging",
1202+
"//src/ray/util:thread_utils",
1203+
"//src/ray/util",
1204+
"@boost//:asio",
1205+
"//src/ray/protobuf:gcs_cc_proto",
1206+
],
1207+
)
1208+
1209+
ray_cc_library(
1210+
name = "worker",
1211+
hdrs = ["src/ray/raylet/worker.h"],
1212+
srcs = ["src/ray/raylet/worker.cc"],
1213+
deps = [
1214+
"@com_google_absl//absl/memory",
1215+
"@com_google_absl//absl/time",
1216+
"@com_google_googletest//:gtest_prod",
1217+
"//src/ray/common:network",
1218+
"//src/ray/common:id",
1219+
"//src/ray/common:task_common",
1220+
":worker_rpc",
1221+
"//src/ray/util:process",
1222+
":node_manager_fbs",
1223+
":cluster_resource_scheduler",
1224+
],
1225+
)
1226+
1227+
ray_cc_library(
1228+
name = "runtime_env_agent_client",
1229+
hdrs = ["src/ray/raylet/runtime_env_agent_client.h"],
1230+
srcs = ["src/ray/raylet/runtime_env_agent_client.cc"],
1231+
deps = [
1232+
"@com_google_absl//absl/container:flat_hash_set",
1233+
"@com_google_absl//absl/strings:str_format",
1234+
"//src/ray/common:asio",
1235+
"//src/ray/common:status",
1236+
"//src/ray/util:logging",
1237+
"//src/ray/common:id",
1238+
"//src/ray/common:ray_config",
1239+
"//src/ray/protobuf:runtime_env_agent_cc_proto",
1240+
"//src/ray/protobuf:gcs_cc_proto",
1241+
"@boost//:beast",
1242+
],
1243+
)
1244+
1245+
ray_cc_library(
1246+
name = "worker_pool",
1247+
hdrs = ["src/ray/raylet/worker_pool.h"],
1248+
srcs = ["src/ray/raylet/worker_pool.cc"],
1249+
deps = [
1250+
"@boost//:system",
1251+
"@com_google_absl//absl/strings",
1252+
"//src/ray/common:network",
1253+
"//src/ray/common:constants",
1254+
"//src/ray/common:ray_config",
1255+
"//src/ray/common:runtime_env",
1256+
"//src/ray/common:status",
1257+
"//src/ray/common:task_common",
1258+
":gcs_client_lib",
1259+
":runtime_env_agent_client",
1260+
":worker",
1261+
":core_worker_lib",
1262+
],
1263+
)
1264+
1265+
ray_cc_library(
1266+
name = "wait_manager",
1267+
hdrs = ["src/ray/raylet/wait_manager.h"],
1268+
srcs = ["src/ray/raylet/wait_manager.cc"],
1269+
deps = [
1270+
"//src/ray/common:id",
1271+
"//src/ray/util:container_util",
1272+
],
1273+
)
1274+
1275+
ray_cc_library(
1276+
name = "local_object_manager",
1277+
hdrs = ["src/ray/raylet/local_object_manager.h"],
1278+
srcs = ["src/ray/raylet/local_object_manager.cc"],
1279+
deps = [
1280+
"//src/ray/common:id",
1281+
"//src/ray/common:ray_object",
1282+
":gcs_client_lib",
1283+
":object_manager_common",
1284+
":object_directory",
1285+
":subscriber_lib",
1286+
":worker_pool",
1287+
":worker_rpc",
1288+
"//src/ray/protobuf:node_manager_cc_proto",
1289+
],
1290+
)
1291+
11921292
ray_cc_library(
11931293
name = "raylet_lib",
11941294
srcs = [
1195-
"src/ray/raylet/agent_manager.cc",
11961295
"src/ray/raylet/dependency_manager.cc",
1197-
"src/ray/raylet/local_object_manager.cc",
11981296
"src/ray/raylet/local_task_manager.cc",
11991297
"src/ray/raylet/node_manager.cc",
12001298
"src/ray/raylet/placement_group_resource_manager.cc",
12011299
"src/ray/raylet/raylet.cc",
1202-
"src/ray/raylet/runtime_env_agent_client.cc",
1203-
"src/ray/raylet/wait_manager.cc",
1204-
"src/ray/raylet/worker.cc",
12051300
"src/ray/raylet/worker_killing_policy.cc",
12061301
"src/ray/raylet/worker_killing_policy_group_by_owner.cc",
12071302
"src/ray/raylet/worker_killing_policy_retriable_fifo.cc",
1208-
"src/ray/raylet/worker_pool.cc",
12091303
],
12101304
hdrs = [
1211-
"src/ray/raylet/agent_manager.h",
12121305
"src/ray/raylet/dependency_manager.h",
1213-
"src/ray/raylet/local_object_manager.h",
12141306
"src/ray/raylet/local_task_manager.h",
12151307
"src/ray/raylet/node_manager.h",
12161308
"src/ray/raylet/placement_group_resource_manager.h",
12171309
"src/ray/raylet/raylet.h",
1218-
"src/ray/raylet/runtime_env_agent_client.h",
12191310
"src/ray/raylet/test/util.h",
1220-
"src/ray/raylet/wait_manager.h",
1221-
"src/ray/raylet/worker.h",
12221311
"src/ray/raylet/worker_killing_policy.h",
12231312
"src/ray/raylet/worker_killing_policy_group_by_owner.h",
12241313
"src/ray/raylet/worker_killing_policy_retriable_fifo.h",
1225-
"src/ray/raylet/worker_pool.h",
12261314
],
12271315
linkopts = select({
12281316
"@platforms//os:windows": [
@@ -1232,8 +1320,14 @@ ray_cc_library(
12321320
],
12331321
}),
12341322
deps = [
1323+
":local_object_manager",
1324+
":wait_manager",
1325+
":runtime_env_agent_client",
1326+
":raylet_agent_manager",
12351327
":core_worker_lib",
12361328
":gcs",
1329+
":worker",
1330+
":worker_pool",
12371331
":gcs_client_lib",
12381332
":node_manager_fbs",
12391333
":node_manager_rpc",
@@ -1250,15 +1344,14 @@ ray_cc_library(
12501344
"//src/ray/util:container_util",
12511345
"//src/ray/util:throttler",
12521346
"@boost//:asio",
1253-
"@boost//:beast",
12541347
"@boost//:system",
12551348
"@com_github_jupp0r_prometheus_cpp//pull",
12561349
"@com_google_absl//absl/base:core_headers",
12571350
"@com_google_absl//absl/container:flat_hash_set",
12581351
"@com_google_absl//absl/memory",
12591352
"@com_google_absl//absl/strings",
12601353
"@com_google_absl//absl/strings:str_format",
1261-
"@com_google_googletest//:gtest",
1354+
"@com_google_googletest//:gtest_prod",
12621355
"@io_opencensus_cpp//opencensus/exporters/stats/prometheus:prometheus_exporter",
12631356
"@io_opencensus_cpp//opencensus/stats",
12641357
"@io_opencensus_cpp//opencensus/tags",

src/ray/raylet/local_object_manager.h

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
#pragma once
1616

17-
#include <google/protobuf/repeated_field.h>
18-
1917
#include <functional>
2018
#include <memory>
2119
#include <queue>
@@ -30,15 +28,14 @@
3028
#include "ray/pubsub/subscriber.h"
3129
#include "ray/raylet/worker_pool.h"
3230
#include "ray/rpc/worker/core_worker_client_pool.h"
33-
#include "ray/util/util.h"
3431
#include "src/ray/protobuf/node_manager.pb.h"
3532

3633
namespace ray {
3734

3835
namespace raylet {
3936

4037
/// The default number of retries when spilled object deletion failed.
41-
const int64_t kDefaultSpilledObjectDeleteRetries = 3;
38+
inline constexpr int64_t kDefaultSpilledObjectDeleteRetries = 3;
4239

4340
/// This class implements memory management for primary objects, objects that
4441
/// have been freed, and objects that have been spilled.

src/ray/raylet/worker.cc

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <utility>
2121

2222
#include "ray/raylet/format/node_manager_generated.h"
23-
#include "ray/raylet/raylet.h"
2423
#include "src/ray/protobuf/core_worker.grpc.pb.h"
2524
#include "src/ray/protobuf/core_worker.pb.h"
2625

0 commit comments

Comments
 (0)