Skip to content

Commit 169bd85

Browse files
committed
os/bluestore: remove zoned namespace support
Lately we've been adding a lot of commits that could've interfered with smr support but since no one is actively reviewing/supporting smr in bluestore, it doesn't make sense for us to mantain it. Signed-off-by: Pere Diaz Bou <[email protected]>
1 parent 16ffaaf commit 169bd85

19 files changed

+76
-2126
lines changed

src/common/options/global.yaml.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4897,7 +4897,6 @@ options:
48974897
- stupid
48984898
- avl
48994899
- hybrid
4900-
- zoned
49014900
with_legacy: true
49024901
- name: bluestore_freelist_blocks_per_key
49034902
type: size
@@ -6326,7 +6325,6 @@ options:
63266325
- aio
63276326
- spdk
63286327
- pmem
6329-
- hm_smr
63306328
- name: bluestore_cleaner_sleep_interval
63316329
type: float
63326330
level: advanced

src/os/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ if(WITH_BLUESTORE)
2727
)
2828
endif(WITH_BLUESTORE)
2929

30-
if(WITH_ZBD)
31-
list(APPEND libos_srcs
32-
bluestore/ZonedFreelistManager.cc
33-
bluestore/ZonedAllocator.cc)
34-
endif()
35-
3630
if(WITH_FUSE)
3731
list(APPEND libos_srcs
3832
FuseStore.cc)

src/os/bluestore/Allocator.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,6 @@ Allocator *Allocator::create(
173173
std::string_view type,
174174
int64_t size,
175175
int64_t block_size,
176-
int64_t zone_size,
177-
int64_t first_sequential_zone,
178176
std::string_view name)
179177
{
180178
Allocator* alloc = nullptr;
@@ -190,11 +188,6 @@ Allocator *Allocator::create(
190188
return new HybridAllocator(cct, size, block_size,
191189
cct->_conf.get_val<uint64_t>("bluestore_hybrid_alloc_mem_cap"),
192190
name);
193-
#ifdef HAVE_LIBZBD
194-
} else if (type == "zoned") {
195-
return new ZonedAllocator(cct, size, block_size, zone_size, first_sequential_zone,
196-
name);
197-
#endif
198191
}
199192
if (alloc == nullptr) {
200193
lderr(cct) << "Allocator::" << __func__ << " unknown alloc type "

src/os/bluestore/Allocator.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ class Allocator {
7272
std::string_view type,
7373
int64_t size,
7474
int64_t block_size,
75-
int64_t zone_size = 0,
76-
int64_t firs_sequential_zone = 0,
7775
const std::string_view name = ""
7876
);
7977

src/os/bluestore/BitmapFreelistManager.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ BitmapFreelistManager::BitmapFreelistManager(CephContext* cct,
6767
}
6868

6969
int BitmapFreelistManager::create(uint64_t new_size, uint64_t granularity,
70-
uint64_t zone_size, uint64_t first_sequential_zone,
7170
KeyValueDB::Transaction txn)
7271
{
7372
bytes_per_block = granularity;

src/os/bluestore/BitmapFreelistManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ class BitmapFreelistManager : public FreelistManager {
6363
static void setup_merge_operator(KeyValueDB *db, std::string prefix);
6464

6565
int create(uint64_t size, uint64_t granularity,
66-
uint64_t zone_size, uint64_t first_sequential_zone,
6766
KeyValueDB::Transaction txn) override;
6867

6968
int init(KeyValueDB *kvdb, bool db_in_read_only,

src/os/bluestore/BlueFS.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,6 @@ void BlueFS::_init_alloc()
749749
alloc[id] = Allocator::create(cct, cct->_conf->bluefs_allocator,
750750
bdev[id]->get_size(),
751751
alloc_size[id],
752-
0, 0,
753752
name);
754753
alloc[id]->init_add_free(
755754
block_reserved[id],

0 commit comments

Comments
 (0)