From: Adam Kupczyk <akupczyk@ibm.com>
Date: Wed, 7 Aug 2024 12:42:35 +0000 (+0200)
Subject: Merge pull request #52489 from ifed01/wip-ifed-alloc2
X-Git-Tag: v20.0.0~1316
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5e8d11fed1aa00d28be4baa84448b849eecf68b;p=ceph.git

Merge pull request #52489 from ifed01/wip-ifed-alloc2

os/bluestore: introduce hybrid_btree2 allocator
---

f5e8d11fed1aa00d28be4baa84448b849eecf68b
diff --cc src/common/options/global.yaml.in
index b170a3e9849c,9c73efd3a69c..78e75caec69d
--- a/src/common/options/global.yaml.in
+++ b/src/common/options/global.yaml.in
@@@ -4211,8 -4183,8 +4211,9 @@@ options
    - bitmap
    - stupid
    - avl
 +  - btree
    - hybrid
+   - hybrid_btree2
    with_legacy: true
  - name: bluefs_log_replay_check_allocations
    type: bool
@@@ -5051,8 -4989,8 +5052,9 @@@
    - bitmap
    - stupid
    - avl
 +  - btree
    - hybrid
+   - hybrid_btree2
    with_legacy: true
  - name: bluestore_freelist_blocks_per_key
    type: size