From: Sage Weil <sage@redhat.com>
Date: Fri, 12 May 2017 02:52:23 +0000 (-0500)
Subject: common: remove max_open_files config option
X-Git-Tag: v12.1.2~192^2~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8463894575958387894bd5dd45d7f9700e51dcd0;p=ceph.git

common: remove max_open_files config option

The only user is init-ceph, and it can get at it via ceph-conf without
the option being declared here.

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 502b23721059..4f51a943588c 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -35,7 +35,6 @@ OPTION(setgroup, OPT_STR, "")        // gid or group name
 OPTION(setuser_match_path, OPT_STR, "")  // make setuser/group conditional on this path matching ownership
 OPTION(pid_file, OPT_STR, "") // default changed by common_preinit()
 OPTION(chdir, OPT_STR, "/")
-OPTION(max_open_files, OPT_LONGLONG, 0)
 OPTION(restapi_log_level, OPT_STR, "") 	// default set by Python code
 OPTION(restapi_base_url, OPT_STR, "")	// "
 OPTION(fatal_signal_handlers, OPT_BOOL, true)
diff --git a/src/test/daemon_config.cc b/src/test/daemon_config.cc
index da494bcad6fb..9d5f674b811c 100644
--- a/src/test/daemon_config.cc
+++ b/src/test/daemon_config.cc
@@ -164,7 +164,7 @@ TEST(DaemonConfig, InjectArgs) {
   char buf[128];
   char *tmp = buf;
   memset(buf, 0, sizeof(buf));
-  ret = g_ceph_context->_conf->get_val("max_open_files", &tmp, sizeof(buf));
+  ret = g_ceph_context->_conf->get_val("leveldb_max_open_files", &tmp, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("42"), string(buf));
 
@@ -268,7 +268,7 @@ TEST(DaemonConfig, InjectArgsBooleans) {
 
   // debug-ms should still become 42...
   memset(buf, 0, sizeof(buf));
-  ret = g_ceph_context->_conf->get_val("max_open_files", &tmp, sizeof(buf));
+  ret = g_ceph_context->_conf->get_val("leveldb_max_open_files", &tmp, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("42"), string(buf));
 }
diff --git a/src/test/libcephfs_config.cc b/src/test/libcephfs_config.cc
index 0d908b8f64d5..d55a5fa563b8 100644
--- a/src/test/libcephfs_config.cc
+++ b/src/test/libcephfs_config.cc
@@ -26,12 +26,12 @@ TEST(LibCephConfig, SimpleSet) {
   int ret = ceph_create(&cmount, NULL);
   ASSERT_EQ(ret, 0);
 
-  ret = ceph_conf_set(cmount, "max_open_files", "21");
+  ret = ceph_conf_set(cmount, "leveldb_max_open_files", "21");
   ASSERT_EQ(ret, 0);
 
   char buf[128];
   memset(buf, 0, sizeof(buf));
-  ret = ceph_conf_get(cmount, "max_open_files", buf, sizeof(buf));
+  ret = ceph_conf_get(cmount, "leveldb_max_open_files", buf, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("21"), string(buf));
 
@@ -43,7 +43,7 @@ TEST(LibCephConfig, ArgV) {
   int ret = ceph_create(&cmount, NULL);
   ASSERT_EQ(ret, 0);
 
-  const char *argv[] = { "foo", "--max-open-files", "2",
+  const char *argv[] = { "foo", "--leveldb-max-open-files", "2",
 			 "--keyfile", "/tmp/my-keyfile", NULL };
   size_t argc = (sizeof(argv) / sizeof(argv[0])) - 1;
   ceph_conf_parse_argv(cmount, argc, argv);
@@ -55,7 +55,7 @@ TEST(LibCephConfig, ArgV) {
   ASSERT_EQ(string("/tmp/my-keyfile"), string(buf));
 
   memset(buf, 0, sizeof(buf));
-  ret = ceph_conf_get(cmount, "max_open_files", buf, sizeof(buf));
+  ret = ceph_conf_get(cmount, "leveldb_max_open_files", buf, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("2"), string(buf));
 
diff --git a/src/test/librados/librados_config.cc b/src/test/librados/librados_config.cc
index 81c0465a38f3..482482fc2a0b 100644
--- a/src/test/librados/librados_config.cc
+++ b/src/test/librados/librados_config.cc
@@ -27,12 +27,12 @@ TEST(LibRadosConfig, SimpleSet) {
   int ret = rados_create(&cl, NULL);
   ASSERT_EQ(ret, 0);
 
-  ret = rados_conf_set(cl, "max_open_files", "21");
+  ret = rados_conf_set(cl, "leveldb_max_open_files", "21");
   ASSERT_EQ(ret, 0);
 
   char buf[128];
   memset(buf, 0, sizeof(buf));
-  ret = rados_conf_get(cl, "max_open_files", buf, sizeof(buf));
+  ret = rados_conf_get(cl, "leveldb_max_open_files", buf, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("21"), string(buf));
 
@@ -44,7 +44,7 @@ TEST(LibRadosConfig, ArgV) {
   int ret = rados_create(&cl, NULL);
   ASSERT_EQ(ret, 0);
 
-  const char *argv[] = { "foo", "--max-open-files", "2",
+  const char *argv[] = { "foo", "--leveldb-max-open-files", "2",
 			 "--keyfile", "/tmp/my-keyfile", NULL };
   size_t argc = (sizeof(argv) / sizeof(argv[0])) - 1;
   rados_conf_parse_argv(cl, argc, argv);
@@ -56,7 +56,7 @@ TEST(LibRadosConfig, ArgV) {
   ASSERT_EQ(string("/tmp/my-keyfile"), string(buf));
 
   memset(buf, 0, sizeof(buf));
-  ret = rados_conf_get(cl, "max_open_files", buf, sizeof(buf));
+  ret = rados_conf_get(cl, "leveldb_max_open_files", buf, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("2"), string(buf));