From: Mykola Golub <mgolub@mirantis.com>
Date: Tue, 10 Nov 2015 09:27:05 +0000 (+0200)
Subject: rbd: make config changes actually apply
X-Git-Tag: v10.0.1~95^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6520%2Fhead;p=ceph.git

rbd: make config changes actually apply

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/tools/rbd/Shell.cc b/src/tools/rbd/Shell.cc
index ec2e8d25ad6..f595faea231 100644
--- a/src/tools/rbd/Shell.cc
+++ b/src/tools/rbd/Shell.cc
@@ -27,8 +27,7 @@ void validate(boost::any& v, const std::vector<std::string>& values,
 
   po::validators::check_first_occurrence(v);
   const std::string &s = po::validators::get_single_string(values);
-  int r = g_conf->set_val("keyfile", s.c_str());
-  assert(r == 0);
+  g_conf->set_val_or_die("keyfile", s.c_str());
   v = boost::any(s);
 }
 
diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc
index 0b811ff2e1b..5d6e322813b 100644
--- a/src/tools/rbd/Utils.cc
+++ b/src/tools/rbd/Utils.cc
@@ -337,6 +337,7 @@ int get_formatter(const po::variables_map &vm,
 
 void init_context() {
   g_conf->set_val_or_die("rbd_cache_writethrough_until_flush", "false");
+  g_conf->apply_changes(NULL);
   common_init_finish(g_ceph_context);
 }