Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

os/bluestore: Remove ExtentFreeListManager. #14772

Merged
merged 1 commit into from
Apr 25, 2017
Merged

os/bluestore: Remove ExtentFreeListManager. #14772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/common/config_opts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,6 @@ OPTION(bluestore_cache_size, OPT_U64, 1024*1024*1024)
OPTION(bluestore_cache_meta_ratio, OPT_DOUBLE, .9)
OPTION(bluestore_kvbackend, OPT_STR, "rocksdb")
OPTION(bluestore_allocator, OPT_STR, "bitmap") // stupid | bitmap
OPTION(bluestore_freelist_type, OPT_STR, "bitmap") // extent | bitmap
OPTION(bluestore_freelist_blocks_per_key, OPT_INT, 128)
OPTION(bluestore_bitmapallocator_blocks_per_zone, OPT_INT, 1024) // must be power of 2 aligned, e.g., 512, 1024, 2048...
OPTION(bluestore_bitmapallocator_span_size, OPT_INT, 1024) // must be power of 2 aligned, e.g., 512, 1024, 2048...
Expand Down
1 change: 0 additions & 1 deletion src/os/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ if(HAVE_LIBAIO)
bluestore/BlueRocksEnv.cc
bluestore/BlueStore.cc
bluestore/bluestore_types.cc
bluestore/ExtentFreelistManager.cc
bluestore/FreelistManager.cc
bluestore/KernelDevice.cc
bluestore/StupidAllocator.cc
Expand Down
4 changes: 0 additions & 4 deletions src/os/bluestore/BitmapFreelistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ class BitmapFreelistManager : public FreelistManager {
void release(
uint64_t offset, uint64_t length,
KeyValueDB::Transaction txn) override;

bool supports_parallel_transactions() override {
return true;
}
};

#endif
9 changes: 3 additions & 6 deletions src/os/bluestore/BlueStore.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4649,7 +4649,7 @@ int BlueStore::mkfs()
}
}

freelist_type = cct->_conf->bluestore_freelist_type;
freelist_type = "bitmap";

r = _open_path();
if (r < 0)
Expand Down Expand Up @@ -7121,9 +7121,7 @@ int BlueStore::_open_super_meta()
freelist_type = std::string(bl.c_str(), bl.length());
dout(10) << __func__ << " freelist_type " << freelist_type << dendl;
} else {
freelist_type = "extent";
dout(10) << __func__ << " freelist_type " << freelist_type
<< " (legacy bluestore instance)" << dendl;
assert("Not Support extent freelist manager" == 0);
}
}

Expand Down Expand Up @@ -7357,8 +7355,7 @@ void BlueStore::_txc_state_proc(TransContext *txc)
}
txc->log_state_latency(logger, l_bluestore_state_io_done_lat);
txc->state = TransContext::STATE_KV_QUEUED;
if (cct->_conf->bluestore_sync_submit_transaction &&
fm->supports_parallel_transactions()) {
if (cct->_conf->bluestore_sync_submit_transaction) {
if (txc->last_nid >= nid_max ||
txc->last_blobid >= blobid_max) {
dout(20) << __func__
Expand Down
284 changes: 0 additions & 284 deletions src/os/bluestore/ExtentFreelistManager.cc
View file
Open in desktop

This file was deleted.

Loading