From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 26 Apr 2017 16:29:45 +0000 (+0800)
Subject: Merge pull request #13053 from Ted-Chang/kstore-bloom-filter
X-Git-Tag: v12.0.3~224
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a81863e7b8ddebee68bd08565ddad7d3e0f3c885;p=ceph.git

Merge pull request #13053 from Ted-Chang/kstore-bloom-filter

os/kstore: Added rocksdb bloom filter settings

Reviewed-by: Sage Weil <sage@redhat.com>
---

a81863e7b8ddebee68bd08565ddad7d3e0f3c885
diff --cc src/common/config_opts.h
index 6419682033dd,78c7600b1e51..c5840f2a6778
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -1154,8 -1037,8 +1154,9 @@@ OPTION(kstore_max_ops, OPT_U64, 512
  OPTION(kstore_max_bytes, OPT_U64, 64*1024*1024)
  OPTION(kstore_backend, OPT_STR, "rocksdb")
  OPTION(kstore_rocksdb_options, OPT_STR, "compression=kNoCompression")
+ OPTION(kstore_rocksdb_bloom_bits_per_key, OPT_INT, 0)
  OPTION(kstore_fsck_on_mount, OPT_BOOL, false)
 +OPTION(kstore_fsck_on_mount_deep, OPT_BOOL, true)
  OPTION(kstore_nid_prealloc, OPT_U64, 1024)
  OPTION(kstore_sync_transaction, OPT_BOOL, false)
  OPTION(kstore_sync_submit_transaction, OPT_BOOL, false)
diff --cc src/kv/RocksDBStore.cc
index 81577401f124,1c1301d1e652..a535179428a2
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@@ -287,8 -279,14 +287,13 @@@ int RocksDBStore::do_open(ostream &out
    }
  
    auto cache = rocksdb::NewLRUCache(g_conf->rocksdb_cache_size, g_conf->rocksdb_cache_shard_bits);
 -  rocksdb::BlockBasedTableOptions bbt_opts;
    bbt_opts.block_size = g_conf->rocksdb_block_size;
    bbt_opts.block_cache = cache;
+   if (g_conf->kstore_rocksdb_bloom_bits_per_key > 0) {
+     dout(10) << __func__ << " set bloom filter bits per key to "
+ 	     << g_conf->kstore_rocksdb_bloom_bits_per_key << dendl;
+     bbt_opts.filter_policy.reset(rocksdb::NewBloomFilterPolicy(g_conf->kstore_rocksdb_bloom_bits_per_key));
+   }
    opt.table_factory.reset(rocksdb::NewBlockBasedTableFactory(bbt_opts));
    dout(10) << __func__ << " set block size to " << g_conf->rocksdb_block_size
             << " cache size to " << g_conf->rocksdb_cache_size