From: Karol Mroz <kmroz@suse.de>
Date: Mon, 2 Oct 2017 21:01:47 +0000 (-0700)
Subject: rgw: stop/join TokenCache revoke thread only if started.
X-Git-Tag: ses5-gm~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d7cf11a7d5beac96e7e7d876d111cb14aae5bf1;p=ceph.git

rgw: stop/join TokenCache revoke thread only if started.

Thread::join triggers an assert otherwise.

Fixes bsc#1059458
Fixes http://tracker.ceph.com/issues/21666

Signed-off-by: Karol Mroz <kmroz@suse.de>
(cherry picked from commit 26f2da083c7dd21b89c1c1e6c498b14e034364a6)
---

diff --git a/src/rgw/rgw_keystone.h b/src/rgw/rgw_keystone.h
index 3add9ae8a4c0..1cdbae519c94 100644
--- a/src/rgw/rgw_keystone.h
+++ b/src/rgw/rgw_keystone.h
@@ -277,8 +277,11 @@ class TokenCache {
   ~TokenCache() {
     down_flag = true;
 
-    revocator.stop();
-    revocator.join();
+    // Only stop and join if revocator thread is started.
+    if (revocator.is_started()) {
+      revocator.stop();
+      revocator.join();
+    }
   }
 
 public: