From: Tianshan Qu <tianshan@xsky.com>
Date: Wed, 20 Jun 2018 01:42:44 +0000 (+0800)
Subject: rgw: fix meta and data notify thread miss stop cr manager
X-Git-Tag: v12.2.8~80^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25a74c96d17e01097ebfff15569cc33bdf1d9ff5;p=ceph.git

rgw: fix meta and data notify thread miss stop cr manager

rgw restrat or reload will stuck in RGWCompletionManager::get_next()

fixes: http://tracker.ceph.com/issues/24589

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 52c22fa9c8ba5d782574625e541f9f2f872d2ce5)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 100f77a699bc..f07a6248517b 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3109,6 +3109,9 @@ class RGWMetaNotifier : public RGWRadosThread {
   uint64_t interval_msec() override {
     return cct->_conf->rgw_md_notify_interval_msec;
   }
+  void stop_process() override {
+    notify_mgr.stop();
+  }
 public:
   RGWMetaNotifier(RGWRados *_store, RGWMetadataLog* log)
     : RGWRadosThread(_store, "meta-notifier"), notify_mgr(_store), log(log) {}
@@ -3141,6 +3144,9 @@ class RGWDataNotifier : public RGWRadosThread {
   uint64_t interval_msec() override {
     return cct->_conf->get_val<int64_t>("rgw_data_notify_interval_msec");
   }
+  void stop_process() override {
+    notify_mgr.stop();
+  }
 public:
   RGWDataNotifier(RGWRados *_store) : RGWRadosThread(_store, "data-notifier"), notify_mgr(_store) {}