From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 18 Jan 2017 04:07:17 +0000 (-0500)
Subject: rgw_file:  signal RGWLibFrontend shutdown correctly
X-Git-Tag: v12.0.0~143^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4efc4cab53163f8bf0ff22514805e7dbf26e3dae;p=ceph-ci.git

rgw_file:  signal RGWLibFrontend shutdown correctly

The shutdown member of RGWLibProcess should be set.

Fixes: http://tracker.ceph.com/issues/18585

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_lib_frontend.h b/src/rgw/rgw_lib_frontend.h
index 9f407f1c4d0..16bfe408dd3 100644
--- a/src/rgw/rgw_lib_frontend.h
+++ b/src/rgw/rgw_lib_frontend.h
@@ -32,6 +32,7 @@ namespace rgw {
 
     void run();
     void checkpoint();
+    void stop() { shutdown = true; }
 
     void register_fs(RGWLibFS* fs) {
       lock_guard guard(mtx);
@@ -76,6 +77,11 @@ namespace rgw {
 		
     int init();
 
+    virtual void stop() {
+      RGWProcessFrontend::stop();
+      get_process()->stop();
+    }
+
     RGWLibProcess* get_process() {
       return static_cast<RGWLibProcess*>(pprocess);
     }