Skip to content

Commit 487beed

Browse files
authored
Merge pull request #30259 from joe-redpanda/cluster-breakup-cleanup
Cut down on //src/v/cluster use
2 parents 68fc4c0 + a6656f4 commit 487beed

28 files changed

Lines changed: 36 additions & 101 deletions

File tree

src/v/cloud_storage/inventory/tests/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ redpanda_cc_gtest(
9999
"//src/v/cloud_storage:types",
100100
"//src/v/cloud_storage/inventory/tests:common",
101101
"//src/v/cloud_storage_clients",
102-
"//src/v/cluster",
103102
"//src/v/cluster:inventory_service",
104103
"//src/v/model",
105104
"//src/v/test_utils:gtest",

src/v/cloud_storage/tests/BUILD

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ redpanda_cc_btest(
251251
"//src/v/bytes:iostream",
252252
"//src/v/cloud_storage",
253253
"//src/v/cloud_storage:types",
254-
"//src/v/cluster",
255254
"//src/v/model",
256255
"//src/v/test_utils:seastar_boost",
257256
"@boost//:test",
@@ -285,7 +284,6 @@ redpanda_cc_gtest(
285284
"//src/v/cloud_storage",
286285
"//src/v/cloud_storage:remote_label",
287286
"//src/v/cloud_storage:types",
288-
"//src/v/cluster",
289287
"//src/v/cluster:types",
290288
"//src/v/model",
291289
"//src/v/test_utils:gtest",
@@ -309,7 +307,6 @@ redpanda_cc_btest(
309307
"//src/v/cloud_storage",
310308
"//src/v/cloud_storage:topic_path_utils",
311309
"//src/v/cloud_storage:types",
312-
"//src/v/cluster",
313310
"//src/v/cluster:types",
314311
"//src/v/model",
315312
"//src/v/test_utils:random",

src/v/cloud_topics/level_one/compaction/tests/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ redpanda_cc_gtest(
105105
"//src/v/cloud_topics/level_one/compaction:log_info_collector",
106106
"//src/v/cloud_topics/level_one/compaction:meta",
107107
"//src/v/cloud_topics/level_one/frontend_reader/tests:l1_reader_fixture",
108-
"//src/v/cluster",
109108
"//src/v/cluster:fwd",
110109
"//src/v/cluster:members_table",
111110
"//src/v/cluster:partition_leaders_table",
@@ -130,7 +129,6 @@ redpanda_cc_gtest(
130129
],
131130
deps = [
132131
"//src/v/cloud_topics/level_one/compaction:log_collector",
133-
"//src/v/cluster",
134132
"//src/v/cluster:commands",
135133
"//src/v/cluster:data_migrated_resources",
136134
"//src/v/cluster:fwd",
@@ -157,7 +155,6 @@ redpanda_test_cc_library(
157155
"//src/v/cloud_topics/level_one/compaction:scheduling_policies",
158156
"//src/v/cloud_topics/level_one/compaction:worker",
159157
"//src/v/cloud_topics/level_one/frontend_reader/tests:l1_reader_fixture",
160-
"//src/v/cluster",
161158
"//src/v/cluster:topic_configuration",
162159
"//src/v/container:chunked_hash_map",
163160
"//src/v/model",
@@ -233,7 +230,6 @@ redpanda_cc_gtest(
233230
deps = [
234231
"//src/v/cloud_io/tests:s3_imposter",
235232
"//src/v/cloud_topics/level_zero/stm:ctp_stm",
236-
"//src/v/cluster",
237233
"//src/v/cluster:cluster_utils",
238234
"//src/v/cluster:controller_log_limiter",
239235
"//src/v/cluster:data_migration_table",

src/v/cloud_topics/level_one/metastore/tests/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ redpanda_cc_gtest(
165165
"//src/v/cloud_io:remote",
166166
"//src/v/cloud_topics/level_one/metastore:simple",
167167
"//src/v/cloud_topics/level_one/metastore:topic_purger",
168-
"//src/v/cluster",
169168
"//src/v/cluster:data_migrated_resources",
170169
"//src/v/cluster:nt_revision",
171170
"//src/v/cluster:topic_table",

src/v/cloud_topics/tests/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ redpanda_cc_gtest(
133133
":cluster_fixture",
134134
"//src/v/base",
135135
"//src/v/cloud_storage",
136-
"//src/v/cluster",
137136
"//src/v/cluster:fwd",
138137
"//src/v/cluster:inventory_service",
139138
"//src/v/cluster:leader_balancer_strategy",

src/v/cluster/BUILD

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,9 +1065,16 @@ redpanda_cc_library(
10651065

10661066
redpanda_cc_library(
10671067
name = "drain_status",
1068+
srcs = [
1069+
"drain_status.cc",
1070+
],
10681071
hdrs = [
10691072
"drain_status.h",
10701073
],
1074+
implementation_deps = [
1075+
"//src/v/base",
1076+
"@fmt",
1077+
],
10711078
visibility = ["//visibility:public"],
10721079
deps = [
10731080
"//src/v/serde",

src/v/cluster/archival/tests/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ redpanda_cc_btest(
320320
memory = "2048MiB",
321321
deps = [
322322
":archival_service_fixture",
323-
"//src/v/cluster",
324323
"//src/v/cluster:cluster_utils",
325324
"//src/v/cluster:data_migration_table",
326325
"//src/v/cluster:errc",

src/v/cluster/cloud_metadata/tests/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ redpanda_cc_gtest(
4141
],
4242
deps = [
4343
"//src/v/bytes:iostream",
44-
"//src/v/cluster",
4544
"//src/v/cluster:cloud_metadata_cluster_manifest",
4645
"//src/v/test_utils:gtest",
4746
"@googletest//:gtest",
@@ -139,7 +138,6 @@ redpanda_cc_gtest(
139138
":manual_mixin",
140139
"//src/v/cloud_io/tests:s3_imposter",
141140
"//src/v/cloud_storage",
142-
"//src/v/cluster",
143141
"//src/v/cluster:cloud_metadata_cluster_manifest",
144142
"//src/v/cluster:cloud_metadata_key_utils",
145143
"//src/v/cluster:cloud_metadata_manifest_downloads",
@@ -198,7 +196,6 @@ redpanda_cc_gtest(
198196
cpu = 1,
199197
deps = [
200198
"//src/v/cloud_io/tests:s3_imposter",
201-
"//src/v/cluster",
202199
"//src/v/cluster:cluster_utils",
203200
"//src/v/cluster:controller_log_limiter",
204201
"//src/v/cluster:data_migration_table",
@@ -290,7 +287,6 @@ redpanda_cc_gtest(
290287
],
291288
cpu = 1,
292289
deps = [
293-
"//src/v/cluster",
294290
"//src/v/cluster:cloud_metadata_key_utils",
295291
"//src/v/test_utils:gtest",
296292
"@googletest//:gtest",

src/v/cluster/cluster_link/tests/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ redpanda_cc_gtest(
2828
],
2929
deps = [
3030
":test_lib",
31-
"//src/v/cluster",
3231
"//src/v/cluster:cluster_link_rpc_types",
3332
"//src/v/cluster:cluster_link_table",
3433
"//src/v/cluster:commands",

src/v/cluster/drain_manager.cc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "cluster/drain_manager.h"
22

3-
#include "base/format_to.h"
43
#include "base/vlog.h"
54
#include "cluster/logger.h"
65
#include "cluster/partition_manager.h"
@@ -283,17 +282,5 @@ ss::future<> drain_manager::do_restore() {
283282
_partition_manager.local().unblock_new_leadership();
284283
co_return;
285284
}
286-
fmt::iterator drain_status::format_to(fmt::iterator it) const {
287-
return fmt::format_to(
288-
it,
289-
"{{finished: {}, errors: {}, partitions: {}, eligible: {}, transferring: "
290-
"{}, failed: {}}}",
291-
finished,
292-
errors,
293-
partitions,
294-
eligible,
295-
transferring,
296-
failed);
297-
}
298285

299286
} // namespace cluster

0 commit comments

Comments
 (0)