Skip to content

Commit

Permalink
storage: ignore cloud_storage_enable_remote_write in is_cloud_retenti…
Browse files Browse the repository at this point in the history
…on_active

We now explicitly set cloud storage settings in the topic config,
the cluster defaults don't matter.
  • Loading branch information
jcsp committed Oct 28, 2022
1 parent 7bbe61a commit f7c3a39
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/v/storage/disk_log_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -664,9 +664,8 @@ disk_log_impl::override_retention_config(compaction_config cfg) const {
}

bool disk_log_impl::is_cloud_retention_active() const {
return config::shard_local_cfg().cloud_storage_enabled() &&
(config::shard_local_cfg().cloud_storage_enable_remote_write()
|| config().is_archival_enabled());
return config::shard_local_cfg().cloud_storage_enabled()
&& (config().is_archival_enabled());
}

compaction_config
Expand Down

0 comments on commit f7c3a39

Please sign in to comment.