common/config: normalize the default value

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

diff --git a/src/common/config.cc b/src/common/config.cc
index 5693dd5d32a2965b00c9485997ba4f9ebaf64477..8665707c9583c6a7123c5f340314413811cc704d 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -188,8 +188,9 @@ md_config_t::md_config_t(bool is_daemon)
       // We call pre_validate as a sanity check, but also to get any
       // side effect (value modification) from the validator.
       std::string *def_str = boost::get<std::string>(&default_val);
+      std::string val = *def_str;
       std::string err;
-      if (opt.pre_validate(def_str, &err) != 0) {
+      if (opt.pre_validate(&val, &err) != 0) {
         std::cerr << "Default value " << opt.name << "=" << *def_str << " is "
                      "invalid: " << err << std::endl;
 
@@ -198,6 +199,11 @@ md_config_t::md_config_t(bool is_daemon)
         // past a pull request: crash out.
         ceph_abort();
       }
+      if (val != *def_str) {
+       // if the validator normalizes the string into a different form than
+       // what was compiled in, use that.
+       set_val_default(opt.name, val);
+      }
     }
   }