Skip to content

Commit

Permalink
Merge pull request #22542 from vbotbuildovich/backport-pr-22335-v24.2…
Browse files Browse the repository at this point in the history
….x-784

[v24.2.x] archival: fix `purger::collect_manifest_paths()`
  • Loading branch information
WillemKauf authored Jul 27, 2024
2 parents 0182e7b + 8ef2313 commit 8a99a88
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion src/v/archival/purger.cc
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,23 @@ purger::collect_manifest_paths(
continue;
}

collected.spillover.push_back(std::move(item.key));
// The spillover manifest path is of the form
// "{prefix}/{manifest.bin().x.x.x.x.x.x}" Find the index of the last
// '/' in the path, so we can check just the filename (starting from the
// first character after '/').
const size_t filename_idx = path.rfind('/');
if (filename_idx == std::string_view::npos) {
continue;
}

// File should start with "manifest.bin()", but it should have
// additional spillover components as well.
std::string_view file = path.substr(filename_idx + 1);
if (
file.starts_with(cloud_storage::partition_manifest::filename())
&& !file.ends_with(cloud_storage::partition_manifest::filename())) {
collected.spillover.push_back(std::move(item.key));
}
}

co_return collected;
Expand Down

0 comments on commit 8a99a88

Please sign in to comment.