kv/RocksDBStore: default to disable row cache.

Signed-off-by: Mark Nelson <mnelson@redhat.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 709d47658c061ba788140afa297f0a1760863fb7..c3626517ab9440d762a9c41403ac129c3e334810 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -970,7 +970,7 @@ OPTION(rocksdb_separate_wal_dir, OPT_BOOL, false) // use $path.wal for wal
 SAFE_OPTION(rocksdb_db_paths, OPT_STR, "")   // path,size( path,size)*
 OPTION(rocksdb_log_to_ceph_log, OPT_BOOL, true)  // log to ceph log
 OPTION(rocksdb_cache_size, OPT_U64, 128*1024*1024)  // default rocksdb cache size
-OPTION(rocksdb_cache_row_ratio, OPT_FLOAT, .2)   // ratio of cache for row (vs block)
+OPTION(rocksdb_cache_row_ratio, OPT_FLOAT, 0)   // ratio of cache for row (vs block)
 OPTION(rocksdb_cache_shard_bits, OPT_INT, 4)  // rocksdb block cache shard bits, 4 bit -> 16 shards
 OPTION(rocksdb_cache_type, OPT_STR, "lru") // 'lru' or 'clock'
 OPTION(rocksdb_block_size, OPT_INT, 4*1024)  // default rocksdb block size

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index 2567e6521279384dba9fe4ddb3994c5c198c1f77..aad274f5c71f5b674f217eb7c3f510bd35735847 100644 (file)
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -318,7 +318,8 @@ int RocksDBStore::do_open(ostream &out, bool create_if_missing)
   }
   bbt_opts.block_size = g_conf->rocksdb_block_size;
 
-  opt.row_cache = rocksdb::NewLRUCache(row_cache_size,
+  if (row_cache_size > 0)
+    opt.row_cache = rocksdb::NewLRUCache(row_cache_size,
                                       g_conf->rocksdb_cache_shard_bits);
 
   if (g_conf->kstore_rocksdb_bloom_bits_per_key > 0) {