From: Adam Kupczyk <akupczyk@ibm.com>
Date: Wed, 7 Aug 2024 08:09:05 +0000 (+0200)
Subject: Merge pull request #55374 from aclamk/wip-aclamk-bs-multi-label
X-Git-Tag: v20.0.0~1321
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bcb68e7f21bb9eca499b1d560e78922ba6aca6c;p=ceph.git

Merge pull request #55374 from aclamk/wip-aclamk-bs-multi-label

os/bluestore: Multiple bdev labels on main block device
---

7bcb68e7f21bb9eca499b1d560e78922ba6aca6c
diff --cc src/os/bluestore/BlueStore.cc
index d297d465c705,e83982ea2a48..6b8ef773f4e6
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -7423,9 -7702,13 +7700,13 @@@ int BlueStore::_open_db_and_around(boo
    }
  
    if (!read_only) {
 -    _post_init_alloc(zone_adjustments);
 +    _post_init_alloc();
    }
  
+   if (bdev_label_multi) {
+     _main_bdev_label_try_reserve();
+   }
+ 
    // when function is called in repair mode (to_repair=true) we skip db->open()/create()
    // we can't change bluestore allocation so no need to invlidate allocation-file
    if (fm->is_null_manager() && !read_only && !to_repair) {