Merge pull request #10965 from ceph/wip-crypto-init

common: only call crypto::init once per CephContext Reviewed-by: Orit Wasserman <owasserm@redhat.com>
ceph · Sep 14, 2016 · 52b0689 · 52b0689
2 parents c2ac199 + 9dfc153
commit 52b0689
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
@@ -599,8 +599,10 @@ void CephContext::put() {
 
 void CephContext::init_crypto()
 {
-  ceph::crypto::init(this);
-  _crypto_inited = true;
+  if (!_crypto_inited) {
+    ceph::crypto::init(this);
+    _crypto_inited = true;
+  }
 }
 
 void CephContext::start_service_thread()