[v24.1.x] archival: fix purger::collect_manifest_paths()
#22541
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Before, the `purger` would push back what it assumed was the spillover manifest file by default to its list of `collected_manifests`. In the case of ABS, `_api.list_objects` might actually return the directory itself as a `Blob`. This would lead to the `purger` attempting to download the directory as if it were a manifest, which would always fail. This would completely block the `purger` from progressing and deleting other partitions in the deleted topic, as it would retry the same doomed manifest download. Correct the logic in `collect_manifest_paths()` by checking the path for `manifest.bin`, which should be contained within the spillover filename (e.g `.../5_21/manifest.bin.10.11.0.1.999.1000`). (cherry picked from commit e3574ff)
WillemKauf
force-pushed
the
backport-pr-22335-v24.1.x-48
branch
from
368492b
to
15fc60d
Compare
|
Backport build failed due to missing Force push to amend: @@ -242,9 +242,10 @@ purger::collect_manifest_paths(
// File should start with "manifest.bin()", but it should have
// additional spillover components as well.
std::string_view file = path.substr(filename_idx + 1);
+ static const ss::sstring partition_manifest_filename = "manifest.bin";
if (
- file.starts_with(cloud_storage::partition_manifest::filename())
- && !file.ends_with(cloud_storage::partition_manifest::filename())) {
+ file.starts_with(partition_manifest_filename)
+ && !file.ends_with(partition_manifest_filename)) {
collected.spillover.push_back(std::move(item.key));
}
} |
|
CI failure is #21626 |
WillemKauf
approved these changes
Jul 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of PR #22335