From: John Spray <john.spray@redhat.com>
Date: Mon, 10 Jul 2017 12:43:25 +0000 (-0400)
Subject: common: sync up options.cc with latest master
X-Git-Tag: v12.1.2~192^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1a6b497fbf9d3273b04152eb4db3a82c4564335;p=ceph.git

common: sync up options.cc with latest master

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 316fca1b57f1..d0c5b2d36661 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -490,6 +490,10 @@ const std::vector<Option> ceph_options = {
   .set_default(false)
   .set_description(""),
 
+  Option("ms_tcp_listen_backlog", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+  .set_default(512)
+  .set_description(""),
+
   Option("ms_rwthread_stack_bytes", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(1024 << 10)
   .set_description(""),
@@ -2977,7 +2981,7 @@ const std::vector<Option> ceph_options = {
   .set_description(""),
 
   Option("rocksdb_cache_row_ratio", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-  .set_default(.2)
+  .set_default(0)
   .set_description(""),
 
   Option("rocksdb_cache_shard_bits", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -3172,6 +3176,10 @@ const std::vector<Option> ceph_options = {
   .set_default(1024)
   .set_description(""),
 
+  Option("bdev_aio_reap_max", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+  .set_default(16)
+  .set_description(""),
+
   Option("bdev_block_size", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(4096)
   .set_description(""),
@@ -3469,11 +3477,15 @@ const std::vector<Option> ceph_options = {
   .set_description(""),
 
   Option("bluestore_cache_meta_ratio", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-  .set_default(.7)
+  .set_default(.01)
   .set_description(""),
 
   Option("bluestore_cache_kv_ratio", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-  .set_default(.2)
+  .set_default(.99)
+  .set_description(""),
+
+  Option("bluestore_cache_kv_max", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+  .set_default(512*1024*1024)
   .set_description(""),
 
   Option("bluestore_kvbackend", Option::TYPE_STR, Option::LEVEL_ADVANCED)