From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 8 Mar 2016 17:32:58 +0000 (-0800)
Subject: rgw: abort early in realm reload if already reloading
X-Git-Tag: v10.1.0~143^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5914ae9d6fd9d51bd59855442640e90430419678;p=ceph.git

rgw: abort early in realm reload if already reloading

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_realm_reloader.cc b/src/rgw/rgw_realm_reloader.cc
index a565b09f7fba..a0c31fe728b8 100644
--- a/src/rgw/rgw_realm_reloader.cc
+++ b/src/rgw/rgw_realm_reloader.cc
@@ -47,6 +47,11 @@ class RGWRealmReloader::C_Reload : public Context {
 void RGWRealmReloader::handle_notify(RGWRealmNotify type,
                                      bufferlist::iterator& p)
 {
+  if (!store) {
+    /* we're in the middle of reload */
+    return;
+  }
+
   CephContext *const cct = store->ctx();
 
   Mutex::Locker lock(mutex);