]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #55374 from aclamk/wip-aclamk-bs-multi-label
authorAdam Kupczyk <akupczyk@ibm.com>
Wed, 7 Aug 2024 08:09:05 +0000 (10:09 +0200)
committerGitHub <noreply@github.com>
Wed, 7 Aug 2024 08:09:05 +0000 (10:09 +0200)
os/bluestore: Multiple bdev labels on main block device

1  2 
src/common/options/global.yaml.in
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/test/objectstore/store_test.cc

Simple merge
index d297d465c7058aa4b78fc9e789309b9edfe45546,e83982ea2a4867485c32f0bdd5b9e2d2a499b72a..6b8ef773f4e6a2ff94095eab95cba0ae42e7c7c2
@@@ -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) {
Simple merge
Simple merge