Skip to content

Commit 5934c74

Browse files
authored
Merge pull request ceph#59850 from aclamk/wip-aclamk-fix-67911-bdev-multi-label
os/bluestore: Fix BlueFS allocating bdev label reserved location.
2 parents aa19cd3 + 9dd0b23 commit 5934c74

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/os/bluestore/BlueStore.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7728,6 +7728,10 @@ int BlueStore::_open_db_and_around(bool read_only, bool to_repair)
77287728
if (r < 0)
77297729
goto out_fm;
77307730

7731+
if (bdev_label_multi) {
7732+
_main_bdev_label_try_reserve();
7733+
}
7734+
77317735
// Re-open in the proper mode(s).
77327736

77337737
// Can't simply bypass second open for read-only mode as we need to
@@ -7744,10 +7748,6 @@ int BlueStore::_open_db_and_around(bool read_only, bool to_repair)
77447748
_post_init_alloc();
77457749
}
77467750

7747-
if (bdev_label_multi) {
7748-
_main_bdev_label_try_reserve();
7749-
}
7750-
77517751
// when function is called in repair mode (to_repair=true) we skip db->open()/create()
77527752
// we can't change bluestore allocation so no need to invlidate allocation-file
77537753
if (fm->is_null_manager() && !read_only && !to_repair) {

0 commit comments

Comments
 (0)