RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11761 from xiexingguo/xxg-wip-fix-envmirror-cleanup

Browse Source 
os/bluestore: fixes and cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-11-03 08:43:15 -05:00 committed by GitHub
commit 13dbff2de9
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/os/bluestore/BlueStore.cc
View File

@ -549,10 +549,7 @@ void BlueStore::Cache::trim(
return;
}
uint64_t need_to_free = 0;
if (current > target_bytes) {
need_to_free = current - target_bytes;
}
uint64_t need_to_free = current - target_bytes;
uint64_t free_buffer = 0;
uint64_t free_meta = 0;
if (current_buffer > target_buffer) {
@ -1566,8 +1563,7 @@ ostream& operator<<(ostream& out, const BlueStore::Extent& e)
BlueStore::ExtentMap::ExtentMap(Onode *o)
: onode(o),
inline_bl(
g_conf ? g_conf->bluestore_extent_map_inline_shard_prealloc_size : 4096) {
inline_bl(g_conf->bluestore_extent_map_inline_shard_prealloc_size) {
}
@ -3420,7 +3416,7 @@ int BlueStore::_open_db(bool create)
rocksdb::Env *b = rocksdb::Env::Default();
if (create) {
string cmd = "rm -rf " + path + "/db " +
path + "/db.slow" +
path + "/db.slow " +
path + "/db.wal";
int r = system(cmd.c_str());
(void)r;
@ -4143,7 +4139,6 @@ int BlueStore::mount()
return 0;
out_stop:
mempool_thread.shutdown();
_kv_stop();
wal_wq.drain();
wal_tp.stop();