os/bluestore: Fix repair of multilabel when collides with BlueFS#60323
Merged
os/bluestore: Fix repair of multilabel when collides with BlueFS#60323
Conversation
ifed01
reviewed
Oct 15, 2024
src/os/bluestore/BlueStore.cc
Outdated
| for (size_t i = 1; i < bdev_label_positions.size(); i++) { | ||
| uint64_t location = bdev_label_positions[i]; | ||
| if (location + lsize <= bdev->get_size()) { | ||
| for (size_t i = 0; i < bdev_label_valid_locations.size(); i++) { |
Contributor
There was a problem hiding this comment.
Now range-based for loop:
"
for (auto loc : bdev_label_valid_locations) {
....
}
"
would look nicer.
ifed01
approved these changes
Oct 16, 2024
Contributor
|
jenkins test make check |
The problem was that BDEV_FIRST_LABEL_POSITION was removed from bdev_label_valid_locations set. Now, if label at BDEV_FIRST_LABEL_POSITION is valid, it is in the set. Fixes: https://tracker.ceph.com/issues/68528 Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
3536ca7 to
7343be7
Compare
Contributor
Author
|
jenkins test make check |
2 similar comments
Contributor
Author
|
jenkins test make check |
Contributor
Author
|
jenkins test make check |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This is both regression and cleanup.
Regression = appeared after merging #59850
Cleanup = now logic of
bdev_label_valid_locationsis more direct.Fixes: https://tracker.ceph.com/issues/68528
Contribution Guidelines
To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an
xbetween the brackets:[x]. Spaces and capitalization matter when checking off items this way.Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume toxjenkins test windowsjenkins test rook e2e