From: Peng Wang <wp389@126.com>
Date: Sun, 17 Feb 2019 09:47:52 +0000 (+0800)
Subject: common/ceph_timer: stop timer's thread when it is suspended
X-Git-Tag: v14.1.0~57^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26469%2Fhead;p=ceph.git

common/ceph_timer: stop timer's thread when it is suspended

otherwise the client could hang when shutting down

Fixes: https://tracker.ceph.com/issues/37766
Signed-off-by: Peng Wang <wp389@126.com>
---

diff --git a/src/common/ceph_timer.h b/src/common/ceph_timer.h
index 623e21d975d..b29fac9c3fc 100644
--- a/src/common/ceph_timer.h
+++ b/src/common/ceph_timer.h
@@ -138,6 +138,8 @@ namespace ceph {
 	    } // Otherwise the event requeued itself
 	  }
 
+          if (suspended)
+            break;
 	  if (schedule.empty())
 	    cond.wait(l);
 	  else