Merge pull request #24089 from vbotbuildovich/backport-pr-23936-v24.1…

….x-296 [v24.1.x] storage: remove assertion on `is_cloud_retention_active`
redpanda-data · Nov 11, 2024 · 6912c71 · 6912c71
2 parents 6764fd6 + abe92c3
commit 6912c71
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/v/storage/disk_log_impl.cc b/src/v/storage/disk_log_impl.cc
@@ -1284,8 +1284,13 @@ ss::future<std::optional<model::offset>> disk_log_impl::do_gc(gc_config cfg) {
         const auto offset = _cloud_gc_offset.value();
         _cloud_gc_offset.reset();
 
-        vassert(
-          is_cloud_retention_active(), "Expected remote retention active");
+        if (!is_cloud_retention_active()) {
+            vlog(
+              gclog.warn,
+              "[{}] expected remote retention to be active",
+              config().ntp());
+            co_return std::nullopt;
+        }
 
         vlog(
           gclog.info,