Skip to content

[CORE-14466] ts: Fix spillover race #28281

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.

Sign up for GitHub

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

Merged
Lazin merged 3 commits into from
Oct 30, 2025
Merged

[CORE-14466] ts: Fix spillover race #28281

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e5630a
ts: Downgrade error to warn
Lazin Oct 30, 2025
a6058cc
ts: Fail housekeeping if we failed to GC
Lazin Oct 30, 2025
c85416a
ts: Fail housekeeping round on retention failure
Lazin Oct 30, 2025
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
12 changes: 11 additions & 1 deletion src/v/cluster/archival/ntp_archiver_service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2774,6 +2774,9 @@ ss::future<> ntp_archiver::apply_archive_retention() {
_rtclog.warn,
"Failed to replicate archive truncation command: {}",
error.message());

throw std::runtime_error(fmt_with_ctx(
fmt::format, "Failed to apply archive retention: {}", error));
Comment thread
Lazin marked this conversation as resolved.
} else {
vlog(
_rtclog.info,
Expand Down Expand Up @@ -2986,6 +2989,10 @@ ss::future<> ntp_archiver::garbage_collect_archive() {
_rtclog.info,
"Failed to clean up metadata after garbage collection: {}",
error);
throw std::runtime_error(fmt_with_ctx(
fmt::format,
"Failed to clean up metadata after archive GC: {}",
Comment thread
Lazin marked this conversation as resolved.
error));
} else {
std::ignore = co_await _remote.delete_objects(
get_bucket_name(), manifests_to_remove, fib);
Expand Down Expand Up @@ -3028,7 +3035,7 @@ ss::future<> ntp_archiver::apply_spillover() {
auto fo = manifest().begin()->base_offset;
if (fo != so.value()) {
vlog(
_rtclog.error,
_rtclog.warn,
"Spillover invariant violated: manifest start_offset {}, first "
"segment base_offset {}",
so.value(),
Expand Down Expand Up @@ -3439,6 +3446,9 @@ ss::future<> ntp_archiver::garbage_collect() {
_rtclog.info,
"Failed to clean up metadata after garbage collection: {}",
error);

throw std::runtime_error(fmt_with_ctx(
fmt::format, "Failed to clean up metadata after GC: {}", error));
Comment thread
Lazin marked this conversation as resolved.
}
} else {
vlog(
Expand Down