From 26f2da083c7dd21b89c1c1e6c498b14e034364a6 Mon Sep 17 00:00:00 2001
From: Karol Mroz <kmroz@suse.de>
Date: Mon, 2 Oct 2017 14:01:47 -0700
Subject: [PATCH] rgw: stop/join TokenCache revoke thread only if started.

Thread::join triggers an assert otherwise.

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

Signed-off-by: Karol Mroz <kmroz@suse.de>
---
 src/rgw/rgw_keystone.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rgw/rgw_keystone.h b/src/rgw/rgw_keystone.h
index 3add9ae8a4c..1cdbae519c9 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:
-- 
2.39.5