From 15170e688b3c6e89f3bd1cdb1b6e344f5ba745db Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 22 Dec 2015 13:54:15 -0500 Subject: [PATCH] librbd: journal events still possible during shutdown Signed-off-by: Jason Dillaman --- src/librbd/Journal.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc index 745c04df64394..b67f2cd61abbe 100644 --- a/src/librbd/Journal.cc +++ b/src/librbd/Journal.cc @@ -728,7 +728,7 @@ void Journal::handle_io_event_safe(int r, uint64_t tid) { << "tid=" << tid << dendl; // journal will be flushed before closing - assert(m_state == STATE_READY); + assert(m_state == STATE_READY || m_state == STATE_STOPPING); if (r < 0) { lderr(cct) << "failed to commit IO event: " << cpp_strerror(r) << dendl; } @@ -789,7 +789,7 @@ void Journal::handle_op_event_safe(int r, uint64_t tid, const Future &future, << "tid=" << tid << dendl; // journal will be flushed before closing - assert(m_state == STATE_READY); + assert(m_state == STATE_READY || m_state == STATE_STOPPING); if (r < 0) { lderr(cct) << "failed to commit op event: " << cpp_strerror(r) << dendl; } -- 2.39.5