kv/RocksDBStore: Handle nullptr if clock cache is chosen.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit 9202285b44ce144864a80cb063269f863bb7d6da)

Conflicts:
	src/kv/RocksDBStore.cc

trivial - g_conf operator()

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index c13453f0ab7228d419edb9136cb948e78c88e068..d47f6da37202576ccf3500a9aacd663d620224bc 100644 (file)
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -402,6 +402,12 @@ int RocksDBStore::load_rocksdb_options(bool create_if_missing, rocksdb::Options&
     bbt_opts.block_cache = rocksdb::NewClockCache(
       block_cache_size,
       g_conf->rocksdb_cache_shard_bits);
+    if (!bbt_opts.block_cache) {
+      derr << "rocksdb_cache_type '" << g_conf->rocksdb_cache_type
+           << "' chosen, but RocksDB not compiled with LibTBB. "
+           << dendl;
+      return -EINVAL;
+    }
   } else {
     derr << "unrecognized rocksdb_cache_type '" << g_conf->rocksdb_cache_type
       << "'" << dendl;