Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v24.1.x] cst/config: Disable trim carryover #21570

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/v/cloud_storage/tests/cache_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <boost/test/unit_test.hpp>

#include <chrono>
#include <cstdint>
#include <fstream>
#include <optional>
#include <stdexcept>
Expand Down Expand Up @@ -565,6 +566,10 @@ FIXTURE_TEST(test_log_segment_cleanup, cache_test_fixture) {
}

FIXTURE_TEST(test_cache_carryover_trim, cache_test_fixture) {
scoped_config cfg;
cfg.get("cloud_storage_cache_trim_carryover_bytes")
.set_value(uint32_t{256_KiB});

std::string write_buf(1_MiB, ' ');
random_generators::fill_buffer_randomchars(
write_buf.data(), write_buf.size());
Expand Down
7 changes: 4 additions & 3 deletions src/v/config/configuration.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2379,10 +2379,11 @@ configuration::configuration()
"over to the next trim operation. This parameter sets a limit on the "
"memory occupied by objects that can be carried over from one trim to "
"next, and allows cache to quickly unblock readers before starting the "
"directory inspection.",
{.needs_restart = needs_restart::no, .visibility = visibility::tunable},
"directory inspection (deprecated)",
{.needs_restart = needs_restart::no,
.visibility = visibility::deprecated},
// This roughly translates to around 1000 carryover file names
256_KiB)
0_KiB)
, cloud_storage_cache_check_interval_ms(
*this,
"cloud_storage_cache_check_interval",
Expand Down
Loading