From 3f749b7a623484d715ead919655a93e346e05e6f Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Tue, 10 Nov 2015 11:27:05 +0200 Subject: [PATCH] rbd: make config changes actually apply Signed-off-by: Mykola Golub --- src/tools/rbd/Shell.cc | 3 +-- src/tools/rbd/Utils.cc | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd/Shell.cc b/src/tools/rbd/Shell.cc index ec2e8d25ad61..f595faea2319 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& 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 0b811ff2e1b6..5d6e322813b2 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); } -- 2.47.3