From 955537776b4f29d0950dd6ca1e56f2ea30a7f1c9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 20 Nov 2017 14:52:51 -0600 Subject: [PATCH] os/bluestore: pass rocksdb options via map, not global config Signed-off-by: Sage Weil --- src/common/legacy_config_opts.h | 2 -- src/common/options.cc | 9 ------ src/kv/RocksDBStore.cc | 50 +++++++++++++++------------------ src/os/bluestore/BlueStore.cc | 22 +++++++-------- 4 files changed, 33 insertions(+), 50 deletions(-) diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h index 7912e4b5fbe..0cc9e7546f6 100644 --- a/src/common/legacy_config_opts.h +++ b/src/common/legacy_config_opts.h @@ -839,8 +839,6 @@ OPTION(kinetic_hmac_key, OPT_STR) // kinetic key to authenticate with OPTION(kinetic_use_ssl, OPT_BOOL) // whether to secure kinetic traffic with TLS -OPTION(rocksdb_separate_wal_dir, OPT_BOOL) // use $path.wal for wal -SAFE_OPTION(rocksdb_db_paths, OPT_STR) // path,size( path,size)* OPTION(rocksdb_log_to_ceph_log, OPT_BOOL) // log to ceph log OPTION(rocksdb_cache_size, OPT_U64) // rocksdb cache size (unless set by bluestore/etc) OPTION(rocksdb_cache_row_ratio, OPT_FLOAT) // ratio of cache for row (vs block) diff --git a/src/common/options.cc b/src/common/options.cc index f9ead98f7c9..d5fc33aea37 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -3181,15 +3181,6 @@ std::vector