From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 16 Oct 2018 14:15:49 +0000 (-0700)
Subject: rgw: move services shutdown around
X-Git-Tag: v14.1.0~965^2~16
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1ad00c9435c7d6104be42dd98e988952e2638190;p=ceph-ci.git

rgw: move services shutdown around

fixes ordering

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

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index d82398ea280..3f743eac40e 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1352,6 +1352,9 @@ void RGWRados::finalize()
   if (cr_registry) {
     cr_registry->put();
   }
+
+  svc.shutdown();
+
   delete meta_mgr;
   delete binfo_cache;
   delete obj_tombstone_cache;
@@ -1366,8 +1369,6 @@ void RGWRados::finalize()
   }
   delete reshard;
   delete index_completion_manager;
-
-  svc.shutdown();
 }
 
 /**