]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13687 from Liuchang0812/wip-19106-eliminate-unsafe-option
authorSage Weil <sage@newdream.net>
Tue, 28 Mar 2017 15:45:01 +0000 (10:45 -0500)
committerGitHub <noreply@github.com>
Tue, 28 Mar 2017 15:45:01 +0000 (10:45 -0500)
common/config: eliminate config_t::set_val unsafe option

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/ceph_mds.cc
src/common/config_opts.h
src/global/global_init.cc
src/kv/RocksDBStore.cc
src/msg/simple/Pipe.cc
src/os/bluestore/BlueStore.cc

diff --cc src/ceph_mds.cc
Simple merge
index cc5665847a262192992742491483c6de794c0260,d33421726b64a8de75846333aeb016500862feb7..19251e7ab976ac4f8d933cd1131a2eb4faf2e487
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge