From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 30 Jul 2020 17:12:20 +0000 (-0400)
Subject: rbd: let librados finish initializing the global context
X-Git-Tag: v15.2.14~31^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bba970c6fdd8722d404e665395d2b3d278f78d46;p=ceph.git

rbd: let librados finish initializing the global context

librados will retrieve a bootstrap config update from the MONs
after connecting and then finish initializing the context. In
general, non-primitive config options cannot be updated after
initialization is complete. This prevents the rbd CLI from
supporting non-primitive config overrides from the MON.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f6c6887fe702190c65245502f04aba5941a4fa15)
---

diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc
index 903e35ca755..69cb7c6baec 100644
--- a/src/tools/rbd/Utils.cc
+++ b/src/tools/rbd/Utils.cc
@@ -661,7 +661,6 @@ 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(nullptr);
-  common_init_finish(g_ceph_context);
 }
 
 int init_rados(librados::Rados *rados) {