common/ceph_context: only common_init_finish() once per cct

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

diff --git a/src/common/ceph_context.h b/src/common/ceph_context.h
index 94179c133d1d529c09a7b1a11c4de93c9b35fcf0..7ac7c32de71798f86e3fffd72275fa16608d4612 100644 (file)
--- a/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@ -71,6 +71,8 @@ public:
   CephContext(CephContext&&) = delete;
   CephContext& operator =(CephContext&&) = delete;
 
+  bool _finished = false;
+
   // ref count!
 private:
   ~CephContext();

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 3042b612940956d3b5332a16f0bec387859b6893..b365ba67ac78e2571dc4c447bc0171f11ce37909 100644 (file)
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -90,6 +90,11 @@ void complain_about_parse_errors(CephContext *cct,
  * same application. */
 void common_init_finish(CephContext *cct)
 {
+  // only do this once per cct
+  if (cct->_finished) {
+    return;
+  }
+  cct->_finished = true;
   cct->init_crypto();
   ZTracer::ztrace_init();