]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
kv/RocksDBStore: Handle nullptr if clock cache is chosen. 22838/head
authorMark Nelson <mnelson@redhat.com>
Thu, 9 Aug 2018 21:50:16 +0000 (16:50 -0500)
committerMark Nelson <mnelson@redhat.com>
Thu, 9 Aug 2018 21:50:51 +0000 (16:50 -0500)
Signed-off-by: Mark Nelson <mnelson@redhat.com>
src/kv/RocksDBStore.cc

index 291d7cb4a9a055da56f2f70523e80ceb32da0837..90d3463428152acdb944bbd897c5f73882f7f6e6 100644 (file)
@@ -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;