RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 01:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60323 from aclamk/wip-aclamk-fix-68528

Browse Source 
os/bluestore: Fix repair of multilabel when collides with BlueFS
This commit is contained in:
Adam Kupczyk 2024-10-18 17:56:46 +02:00 committed by GitHub
commit 4b54215700
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/os/bluestore/BlueStore.cc
View File

@ -6794,9 +6794,8 @@ void BlueStore::_main_bdev_label_try_reserve()
vector<uint64_t> candidate_positions;
vector<uint64_t> accepted_positions;
uint64_t lsize = std::max(BDEV_LABEL_BLOCK_SIZE, min_alloc_size);
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 (uint64_t location : bdev_label_valid_locations) {
if (location != BDEV_FIRST_LABEL_POSITION) {
candidate_positions.push_back(location);
}
}
@ -11497,9 +11496,7 @@ int BlueStore::_fsck_on_open(BlueStore::FSCKDepth depth, bool repair)
string p = path + "/block";
_write_bdev_label(cct, bdev, p, bdev_label, bdev_labels_in_repair);
for (uint64_t pos : bdev_labels_in_repair) {
if (pos != BDEV_FIRST_LABEL_POSITION) {
bdev_label_valid_locations.push_back(pos);
}
bdev_label_valid_locations.push_back(pos);
}
repaired += bdev_labels_in_repair.size();
}