common/config: take level to parse_argv

A few callers are explicitly parsing args from the environment.

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

diff --git a/src/common/config.cc b/src/common/config.cc
index 8580cd553ac3c7f809666bf37f0047a750ad88e0..8fa4d3d496b6a4ac485920a83f4e279b1c24236d 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -515,7 +515,7 @@ void md_config_t::_show_config(std::ostream *out, Formatter *f)
   }
 }
 
-int md_config_t::parse_argv(std::vector<const char*>& args)
+int md_config_t::parse_argv(std::vector<const char*>& args, int level)
 {
   Mutex::Locker l(lock);
   if (safe_to_start_threads) {
@@ -575,7 +575,7 @@ int md_config_t::parse_argv(std::vector<const char*>& args)
       set_val_or_die("client_mountpoint", val.c_str());
     }
     else {
-      int r = parse_option(args, i, NULL, CONF_CMDLINE);
+      int r = parse_option(args, i, NULL, level);
       if (r < 0) {
         return r;
       }

diff --git a/src/common/config.h b/src/common/config.h
index ebbacb9b6cce7daf2a5ef7ab87ac786c309ded5c..5cdc71e5eb219d0fdc72e6c4ac5c4e3d8a629554 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -144,7 +144,7 @@ public:
   void parse_env();
 
   // Absorb config settings from argv
-  int parse_argv(std::vector<const char*>& args);
+  int parse_argv(std::vector<const char*>& args, int level=CONF_CMDLINE);
 
   // do any commands we got from argv (--show-config, --show-config-val)
   void do_argv_commands();

diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index 9f1a27eb73f19abbaf46e439e9ca91f0cbb20dea..a903318cbd98879f4d8ac3a5f83901ffc153e9ae 100644 (file)
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -211,7 +211,7 @@ public:
     md_config_t *conf = cct->_conf;
     vector<const char*> args;
     env_to_vec(args, name);
-    int ret = conf->parse_argv(args);
+    int ret = conf->parse_argv(args, CONF_ENV);
     if (ret)
       return ret;
     conf->apply_changes(nullptr);

diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index c97a07ccc19068ef25fd1c4881db899d07d8ba4e..cac8c2360802ce485a5c590c720af75caccce5df 100644 (file)
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -3005,7 +3005,7 @@ extern "C" int rados_conf_parse_env(rados_t cluster, const char *env)
   md_config_t *conf = client->cct->_conf;
   vector<const char*> args;
   env_to_vec(args, env);
-  int ret = conf->parse_argv(args);
+  int ret = conf->parse_argv(args, CONF_ENV);
   if (ret) {
     tracepoint(librados, rados_conf_parse_env_exit, ret);
     return ret;