cluster: move archival into cluster library

This move relocates archival into the cluster library to reflect the
reality that it was built as part of v::cluster. While build systems
like CMake are fine with this chaos, others are more strict.

Signed-off-by: Noah Watkins <[email protected]>

src/v/CMakeLists.txt

@@ -120,7 +120,6 @@ add_subdirectory(kafka)
 add_subdirectory(reflection)
 add_subdirectory(pandaproxy)
 add_subdirectory(cloud_storage_clients)
-add_subdirectory(archival)
 add_subdirectory(security)
 add_subdirectory(serde)
 add_subdirectory(cloud_storage)

src/v/cloud_storage/anomalies_detector.h

@@ -10,11 +10,11 @@
 
 #pragma once
 
-#include "archival/types.h"
 #include "base/seastarx.h"
 #include "cloud_storage/fwd.h"
 #include "cloud_storage/spillover_manifest.h"
 #include "cloud_storage/types.h"
+#include "cluster/archival/types.h"
 #include "model/fundamental.h"
 #include "model/metadata.h"
 #include "utils/retry_chain_node.h"

src/v/cloud_storage/tests/cloud_storage_e2e_test.cc

@@ -8,13 +8,13 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/archival_metadata_stm.h"
-#include "archival/ntp_archiver_service.h"
 #include "cloud_storage/remote.h"
 #include "cloud_storage/spillover_manifest.h"
 #include "cloud_storage/tests/manual_fixture.h"
 #include "cloud_storage/tests/produce_utils.h"
 #include "cloud_storage/tests/s3_imposter.h"
+#include "cluster/archival/archival_metadata_stm.h"
+#include "cluster/archival/ntp_archiver_service.h"
 #include "cluster/cloud_metadata/tests/manual_mixin.h"
 #include "cluster/health_monitor_frontend.h"
 #include "config/configuration.h"

src/v/cloud_storage/tests/delete_records_e2e_test.cc

@@ -8,11 +8,11 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/archival_metadata_stm.h"
-#include "archival/ntp_archiver_service.h"
 #include "cloud_storage/spillover_manifest.h"
 #include "cloud_storage/tests/produce_utils.h"
 #include "cloud_storage/tests/s3_imposter.h"
+#include "cluster/archival/archival_metadata_stm.h"
+#include "cluster/archival/ntp_archiver_service.h"
 #include "config/configuration.h"
 #include "kafka/server/tests/delete_records_utils.h"
 #include "kafka/server/tests/list_offsets_utils.h"

src/v/cloud_storage/tests/produce_utils.h

@@ -10,8 +10,8 @@
  */
 #pragma once
 
-#include "archival/ntp_archiver_service.h"
 #include "cloud_storage/remote_segment.h"
+#include "cluster/archival/ntp_archiver_service.h"
 #include "cluster/partition.h"
 #include "config/configuration.h"
 #include "kafka/server/tests/produce_consume_utils.h"

src/v/cloud_storage/tests/read_replica_test.cc

@@ -9,12 +9,12 @@
  * by the Apache License, Version 2.0
  */
 
-#include "archival/archival_metadata_stm.h"
-#include "archival/ntp_archiver_service.h"
 #include "cloud_storage/spillover_manifest.h"
 #include "cloud_storage/tests/produce_utils.h"
 #include "cloud_storage/tests/s3_imposter.h"
 #include "cloud_storage/types.h"
+#include "cluster/archival/archival_metadata_stm.h"
+#include "cluster/archival/ntp_archiver_service.h"
 #include "config/configuration.h"
 #include "kafka/server/tests/delete_records_utils.h"
 #include "kafka/server/tests/list_offsets_utils.h"

src/v/cluster/CMakeLists.txt

@@ -202,20 +202,20 @@ v_cc_library(
     plugin_table.cc
     plugin_frontend.cc
     plugin_backend.cc
-    ../archival/archival_metadata_stm.cc
-    ../archival/archival_policy.cc
-    ../archival/ntp_archiver_service.cc
-    ../archival/probe.cc
-    ../archival/types.cc
-    ../archival/upload_controller.cc
-    ../archival/segment_reupload.cc
-    ../archival/retention_calculator.cc
-    ../archival/upload_housekeeping_service.cc
-    ../archival/adjacent_segment_merger.cc
-    ../archival/purger.cc
-    ../archival/scrubber.cc
-    ../archival/archiver_manager.cc
-    ../archival/async_data_uploader.cc
+    archival/archival_metadata_stm.cc
+    archival/archival_policy.cc
+    archival/ntp_archiver_service.cc
+    archival/probe.cc
+    archival/types.cc
+    archival/upload_controller.cc
+    archival/segment_reupload.cc
+    archival/retention_calculator.cc
+    archival/upload_housekeeping_service.cc
+    archival/adjacent_segment_merger.cc
+    archival/purger.cc
+    archival/scrubber.cc
+    archival/archiver_manager.cc
+    archival/async_data_uploader.cc
     cloud_metadata/cluster_manifest.cc
     cloud_metadata/cluster_recovery_backend.cc
     cloud_metadata/key_utils.cc
@@ -255,6 +255,7 @@ v_cc_library(
 add_subdirectory(tests)
 add_subdirectory(cloud_metadata/tests)
 add_subdirectory(self_test/tests)
+add_subdirectory(archival)
 
 # Separate library for recovery bits that may depend on Kafka subsystems.
 v_cc_library(

src/v/archival/adjacent_segment_merger.cc → src/v/cluster/archival/adjacent_segment_merger.cc

@@ -8,12 +8,12 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/adjacent_segment_merger.h"
+#include "cluster/archival/adjacent_segment_merger.h"
 
-#include "archival/logger.h"
-#include "archival/ntp_archiver_service.h"
-#include "archival/segment_reupload.h"
-#include "archival/types.h"
+#include "cluster/archival/logger.h"
+#include "cluster/archival/ntp_archiver_service.h"
+#include "cluster/archival/segment_reupload.h"
+#include "cluster/archival/types.h"
 #include "config/configuration.h"
 #include "model/fundamental.h"
 #include "storage/disk_log_impl.h"

src/v/archival/adjacent_segment_merger.h → src/v/cluster/archival/adjacent_segment_merger.h

@@ -9,8 +9,8 @@
  */
 #pragma once
 
-#include "archival/ntp_archiver_service.h"
-#include "archival/types.h"
+#include "cluster/archival/ntp_archiver_service.h"
+#include "cluster/archival/types.h"
 #include "config/property.h"
 #include "utils/retry_chain_node.h"
 

src/v/archival/archival_metadata_stm.cc → src/v/cluster/archival/archival_metadata_stm.cc

@@ -7,15 +7,15 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0
 
-#include "archival/archival_metadata_stm.h"
+#include "cluster/archival/archival_metadata_stm.h"
 
-#include "archival/logger.h"
 #include "base/vlog.h"
 #include "bytes/iobuf.h"
 #include "bytes/iostream.h"
 #include "cloud_storage/partition_manifest.h"
 #include "cloud_storage/remote.h"
 #include "cloud_storage/types.h"
+#include "cluster/archival/logger.h"
 #include "cluster/errc.h"
 #include "cluster/logger.h"
 #include "cluster/prefix_truncate_record.h"

src/v/archival/archival_policy.cc → src/v/cluster/archival/archival_policy.cc

@@ -8,11 +8,11 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/archival_policy.h"
+#include "cluster/archival/archival_policy.h"
 
-#include "archival/logger.h"
-#include "archival/segment_reupload.h"
 #include "base/vlog.h"
+#include "cluster/archival/logger.h"
+#include "cluster/archival/segment_reupload.h"
 #include "config/configuration.h"
 #include "storage/disk_log_impl.h"
 #include "storage/fs_utils.h"

src/v/archival/archival_policy.h → src/v/cluster/archival/archival_policy.h

@@ -10,10 +10,10 @@
 
 #pragma once
 
-#include "archival/probe.h"
-#include "archival/types.h"
 #include "cloud_storage/partition_manifest.h"
 #include "cloud_storage/types.h"
+#include "cluster/archival/probe.h"
+#include "cluster/archival/types.h"
 #include "model/fundamental.h"
 #include "storage/fwd.h"
 #include "storage/ntp_config.h"

src/v/archival/archiver_manager.cc → src/v/cluster/archival/archiver_manager.cc

@@ -8,12 +8,12 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/archiver_manager.h"
+#include "cluster/archival/archiver_manager.h"
 
-#include "archival/logger.h"
-#include "archival/ntp_archiver_service.h"
-#include "archival/upload_housekeeping_service.h"
 #include "cloud_storage/cache_service.h"
+#include "cluster/archival/logger.h"
+#include "cluster/archival/ntp_archiver_service.h"
+#include "cluster/archival/upload_housekeeping_service.h"
 #include "cluster/partition_manager.h"
 #include "cluster/types.h"
 #include "config/configuration.h"

src/v/archival/archiver_manager.h → src/v/cluster/archival/archiver_manager.h

@@ -10,9 +10,9 @@
 
 #pragma once
 
-#include "archival/ntp_archiver_service.h"
-#include "archival/probe.h"
-#include "archival/types.h"
+#include "cluster/archival/ntp_archiver_service.h"
+#include "cluster/archival/probe.h"
+#include "cluster/archival/types.h"
 #include "cluster/fwd.h"
 #include "cluster/partition_leaders_table.h"
 #include "container/fragmented_vector.h"

src/v/archival/async_data_uploader.cc → src/v/cluster/archival/async_data_uploader.cc

@@ -8,11 +8,11 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/async_data_uploader.h"
+#include "cluster/archival/async_data_uploader.h"
 
-#include "archival/logger.h"
-#include "archival/types.h"
 #include "base/vlog.h"
+#include "cluster/archival/logger.h"
+#include "cluster/archival/types.h"
 #include "model/record.h"
 #include "model/timeout_clock.h"
 #include "resource_mgmt/io_priority.h"

src/v/archival/ntp_archiver_service.cc → src/v/cluster/archival/ntp_archiver_service.cc

@@ -8,16 +8,8 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/ntp_archiver_service.h"
-
-#include "archival/adjacent_segment_merger.h"
-#include "archival/archival_metadata_stm.h"
-#include "archival/archival_policy.h"
-#include "archival/logger.h"
-#include "archival/retention_calculator.h"
-#include "archival/scrubber.h"
-#include "archival/segment_reupload.h"
-#include "archival/types.h"
+#include "cluster/archival/ntp_archiver_service.h"
+
 #include "base/vlog.h"
 #include "cloud_storage/async_manifest_view.h"
 #include "cloud_storage/partition_manifest.h"
@@ -29,6 +21,14 @@
 #include "cloud_storage/tx_range_manifest.h"
 #include "cloud_storage/types.h"
 #include "cloud_storage_clients/types.h"
+#include "cluster/archival/adjacent_segment_merger.h"
+#include "cluster/archival/archival_metadata_stm.h"
+#include "cluster/archival/archival_policy.h"
+#include "cluster/archival/logger.h"
+#include "cluster/archival/retention_calculator.h"
+#include "cluster/archival/scrubber.h"
+#include "cluster/archival/segment_reupload.h"
+#include "cluster/archival/types.h"
 #include "cluster/partition_manager.h"
 #include "config/configuration.h"
 #include "container/fragmented_vector.h"

src/v/archival/ntp_archiver_service.h → src/v/cluster/archival/ntp_archiver_service.h

@@ -9,16 +9,16 @@
  */
 
 #pragma once
-#include "archival/archival_policy.h"
-#include "archival/probe.h"
-#include "archival/scrubber.h"
-#include "archival/types.h"
 #include "cloud_storage/cache_service.h"
 #include "cloud_storage/fwd.h"
 #include "cloud_storage/partition_manifest.h"
 #include "cloud_storage/remote.h"
 #include "cloud_storage/remote_segment_index.h"
 #include "cloud_storage/types.h"
+#include "cluster/archival/archival_policy.h"
+#include "cluster/archival/probe.h"
+#include "cluster/archival/scrubber.h"
+#include "cluster/archival/types.h"
 #include "cluster/fwd.h"
 #include "model/fundamental.h"
 #include "model/metadata.h"

src/v/archival/probe.cc → src/v/cluster/archival/probe.cc

@@ -8,7 +8,7 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/probe.h"
+#include "cluster/archival/probe.h"
 
 #include "config/configuration.h"
 #include "metrics/prometheus_sanitize.h"

src/v/archival/probe.h → src/v/cluster/archival/probe.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "archival/types.h"
 #include "base/seastarx.h"
+#include "cluster/archival/types.h"
 #include "metrics/metrics.h"
 #include "model/fundamental.h"
 

src/v/archival/purger.cc → src/v/cluster/archival/purger.cc

@@ -8,16 +8,16 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/purger.h"
+#include "cluster/archival/purger.h"
 
-#include "archival/logger.h"
 #include "base/vlog.h"
 #include "cloud_storage/lifecycle_marker.h"
 #include "cloud_storage/partition_manifest.h"
 #include "cloud_storage/remote.h"
 #include "cloud_storage/remote_partition.h"
 #include "cloud_storage/topic_manifest.h"
 #include "cloud_storage/tx_range_manifest.h"
+#include "cluster/archival/logger.h"
 #include "cluster/members_table.h"
 #include "cluster/topic_table.h"
 #include "cluster/topics_frontend.h"

src/v/archival/purger.h → src/v/cluster/archival/purger.h

@@ -8,10 +8,10 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/types.h"
 #include "cloud_storage/base_manifest.h"
 #include "cloud_storage/fwd.h"
 #include "cloud_storage/lifecycle_marker.h"
+#include "cluster/archival/types.h"
 #include "cluster/fwd.h"
 #include "cluster/types.h"
 

src/v/archival/retention_calculator.cc → src/v/cluster/archival/retention_calculator.cc

@@ -8,7 +8,7 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/retention_calculator.h"
+#include "cluster/archival/retention_calculator.h"
 
 namespace archival {
 /*

src/v/archival/scrubber.cc → src/v/cluster/archival/scrubber.cc

@@ -8,10 +8,10 @@
  * https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
  */
 
-#include "archival/scrubber.h"
+#include "cluster/archival/scrubber.h"
 
-#include "archival/logger.h"
-#include "archival/ntp_archiver_service.h"
+#include "cluster/archival/logger.h"
+#include "cluster/archival/ntp_archiver_service.h"
 #include "cluster/errc.h"
 
 namespace archival {

src/v/archival/scrubber.h → src/v/cluster/archival/scrubber.h

@@ -10,11 +10,11 @@
 
 #pragma once
 
-#include "archival/fwd.h"
-#include "archival/scrubber_scheduler.h"
-#include "archival/types.h"
 #include "cloud_storage/anomalies_detector.h"
 #include "cloud_storage/fwd.h"
+#include "cluster/archival/fwd.h"
+#include "cluster/archival/scrubber_scheduler.h"
+#include "cluster/archival/types.h"
 #include "features/feature_table.h"
 
 #include <seastar/core/future.hh>

src/v/archival/segment_reupload.h → src/v/cluster/archival/segment_reupload.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "archival/archival_policy.h"
 #include "cloud_storage/types.h"
+#include "cluster/archival/archival_policy.h"
 #include "model/fundamental.h"
 
 #include <seastar/core/io_priority_class.hh>