From: Sage Weil <sage@newdream.net>
Date: Tue, 28 Mar 2017 15:45:01 +0000 (-0500)
Subject: Merge pull request #13687 from Liuchang0812/wip-19106-eliminate-unsafe-option
X-Git-Tag: v12.0.2~281
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eda8d28c37e4f3184aa05b234a0a9b575b99d4d9;p=ceph.git

Merge pull request #13687 from Liuchang0812/wip-19106-eliminate-unsafe-option

common/config: eliminate config_t::set_val unsafe option

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

eda8d28c37e4f3184aa05b234a0a9b575b99d4d9
diff --cc src/common/config_opts.h
index cc5665847a26,d33421726b64..19251e7ab976
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -907,9 -910,9 +907,9 @@@ OPTION(kinetic_use_ssl, OPT_BOOL, false
  
  
  OPTION(rocksdb_separate_wal_dir, OPT_BOOL, false) // use $path.wal for wal
- OPTION(rocksdb_db_paths, OPT_STR, "")   // path,size( path,size)*
+ 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_INT, 128*1024*1024)  // default rocksdb cache size
 +OPTION(rocksdb_cache_size, OPT_U64, 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) // Enabling this will have 5-10% impact on performance for the stats collection