From: Mark Kogan <mkogan@redhat.com>
Date: Thu, 14 May 2020 10:31:33 +0000 (+0300)
Subject: rgwlc: wait for WorkQ threads on shutdown
X-Git-Tag: v15.2.5~56^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c498b0bf17c79c28d4cc14608db288cae51be74;p=ceph.git

rgwlc: wait for WorkQ threads on shutdown

Fixes: https://tracker.ceph.com/issues/43841

Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 0f3e1f023a899f261bb38e7236ac35587438ad29)
---

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index 736b576969e..46e17d12f89 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -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);