From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 8 Jan 2016 21:58:20 +0000 (-0800)
Subject: rgw: reorder RGWRados shutdown
X-Git-Tag: v10.1.0~354^2~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5363017e25d0f0a67b1df2ca4713824b1319d9f6;p=ceph.git

rgw: reorder RGWRados shutdown

dependency order fixes

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

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 758312d070e..a8197c0a51d 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3073,6 +3073,14 @@ void RGWRados::finalize()
      */
     delete finisher;
   }
+  if (meta_notifier) {
+    meta_notifier->stop();
+    delete meta_notifier;
+  }
+  if (data_notifier) {
+    data_notifier->stop();
+    delete data_notifier;
+  }
   delete meta_mgr;
   delete data_log;
   if (use_gc_thread) {
@@ -3085,14 +3093,6 @@ void RGWRados::finalize()
   delete obj_expirer;
   obj_expirer = NULL;
 
-  if (meta_notifier) {
-    meta_notifier->stop();
-    delete meta_notifier;
-  }
-  if (data_notifier) {
-    data_notifier->stop();
-    delete data_notifier;
-  }
   delete rest_master_conn;
 
   map<string, RGWRESTConn *>::iterator iter;