]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common/ceph_timer: stop timer's thread when it is suspended 26469/head
authorPeng Wang <wp389@126.com>
Sun, 17 Feb 2019 09:47:52 +0000 (17:47 +0800)
committerPeng Wang <wp389@126.com>
Sun, 17 Feb 2019 09:47:53 +0000 (17:47 +0800)
otherwise the client could hang when shutting down

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

index 623e21d975d34186d73ab4eca2a99aab54810b4e..b29fac9c3fcb3024f6a6b45156b685ee7dc991dc 100644 (file)
@@ -138,6 +138,8 @@ namespace ceph {
            } // Otherwise the event requeued itself
          }
 
+          if (suspended)
+            break;
          if (schedule.empty())
            cond.wait(l);
          else