From: Sage Weil <sage@redhat.com>
Date: Thu, 3 Nov 2016 14:55:41 +0000 (-0400)
Subject: kv/RocksDBStore: rename option
X-Git-Tag: v11.1.0~432^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11769%2Fhead;p=ceph.git

kv/RocksDBStore: rename option

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 268aee95ec2..2bfb561404b 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -863,6 +863,8 @@ OPTION(rocksdb_log_to_ceph_log, OPT_BOOL, true)  // log to ceph log
 OPTION(rocksdb_cache_size, OPT_INT, 128*1024*1024)  // default rocksdb cache size
 OPTION(rocksdb_cache_shard_bits, OPT_INT, 4)  // rocksdb block cache shard bits, 4 bit -> 16 shards
 OPTION(rocksdb_block_size, OPT_INT, 4*1024)  // default rocksdb block size
+OPTION(rocksdb_perf, OPT_BOOL, false) // rocksdb breakdown
+
 // rocksdb options that will be used for omap(if omap_backend is rocksdb)
 OPTION(filestore_rocksdb_options, OPT_STR, "")
 // rocksdb options that will be used in monstore
@@ -1011,7 +1013,6 @@ OPTION(bluestore_freelist_blocks_per_key, OPT_INT, 128)
 OPTION(bluestore_bitmapallocator_blocks_per_zone, OPT_INT, 1024) // must be power of 2 aligned, e.g., 512, 1024, 2048...
 OPTION(bluestore_bitmapallocator_span_size, OPT_INT, 1024) // must be power of 2 aligned, e.g., 512, 1024, 2048...
 OPTION(bluestore_rocksdb_options, OPT_STR, "compression=kNoCompression,max_write_buffer_number=4,min_write_buffer_number_to_merge=1,recycle_log_file_num=4,write_buffer_size=268435456")
-OPTION(bluestore_rocksdb_perf, OPT_BOOL, false) // rocksdb breakdown
 OPTION(bluestore_fsck_on_mount, OPT_BOOL, false)
 OPTION(bluestore_fsck_on_mount_deep, OPT_BOOL, true)
 OPTION(bluestore_fsck_on_umount, OPT_BOOL, false)
diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index f3e743d4d78..32807b5eb1e 100644
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -368,7 +368,7 @@ int RocksDBStore::submit_transaction(KeyValueDB::Transaction t)
   utime_t start = ceph_clock_now(g_ceph_context);
   // enable rocksdb breakdown
   // considering performance overhead, default is disabled
-  if (g_conf->bluestore_rocksdb_perf) {
+  if (g_conf->rocksdb_perf) {
     rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
     rocksdb::perf_context.Reset();
   }
@@ -418,7 +418,7 @@ int RocksDBStore::submit_transaction_sync(KeyValueDB::Transaction t)
   utime_t start = ceph_clock_now(g_ceph_context);
   // enable rocksdb breakdown
   // considering performance overhead, default is disabled
-  if (g_conf->bluestore_rocksdb_perf) {
+  if (g_conf->rocksdb_perf) {
     rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
     rocksdb::perf_context.Reset();
   }