]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgwlc: wait for WorkQ threads on shutdown
authorMark Kogan <mkogan@redhat.com>
Thu, 14 May 2020 10:31:33 +0000 (13:31 +0300)
committerNathan Cutler <ncutler@suse.com>
Sun, 9 Aug 2020 20:49:12 +0000 (22:49 +0200)
Fixes: https://tracker.ceph.com/issues/43841
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 0f3e1f023a899f261bb38e7236ac35587438ad29)

src/rgw/rgw_lc.cc

index 736b576969e67953a99817684638093b9d875f68..46e17d12f89b68cfb767832034e496b831fb1133 100644 (file)
@@ -775,6 +775,12 @@ public:
       ix(0)
     {}
 
+  ~WorkPool() {
+    for (auto& wq : wqs) {
+      wq.join();
+    }
+  }
+
   void setf(WorkQ::work_f _f) {
     for (auto& wq : wqs) {
       wq.setf(_f);