From: Sage Weil <sage@redhat.com>
Date: Fri, 18 May 2018 19:24:06 +0000 (-0500)
Subject: msg/async/Event: clear time_events on shutdown
X-Git-Tag: v13.2.0~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33abe0280ae8672622bd6f35cc9665ca2c0347d3;p=ceph.git

msg/async/Event: clear time_events on shutdown

Works around crash from http://tracker.ceph.com/issues/24162

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 923bd4649aacfb02a783fab9a0a71d1395d6e474)
---

diff --git a/src/msg/async/Event.cc b/src/msg/async/Event.cc
index b2a25660b34..9e16efd867c 100644
--- a/src/msg/async/Event.cc
+++ b/src/msg/async/Event.cc
@@ -171,7 +171,8 @@ EventCenter::~EventCenter()
       external_events.pop_front();
     }
   }
-  assert(time_events.empty());
+  time_events.clear();
+  //assert(time_events.empty());
 
   if (notify_receive_fd >= 0)
     ::close(notify_receive_fd);