]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw_file: signal RGWLibFrontend shutdown correctly
authorMatt Benjamin <mbenjamin@redhat.com>
Wed, 18 Jan 2017 04:07:17 +0000 (23:07 -0500)
committerMatt Benjamin <mbenjamin@redhat.com>
Wed, 18 Jan 2017 15:33:34 +0000 (10:33 -0500)
The shutdown member of RGWLibProcess should be set.

Fixes: http://tracker.ceph.com/issues/18585
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
src/rgw/rgw_lib_frontend.h

index 9f407f1c4d04eab9a7c70c3b34b68bcda3a4ca1f..16bfe408dd35a6b1802a698520ef59202ffcca2c 100644 (file)
@@ -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);
     }