From: Mykola Golub <mgolub@suse.com>
Date: Tue, 25 Jun 2019 16:55:40 +0000 (+0100)
Subject: journal: fix race between player shut down and cache rebalance
X-Git-Tag: v15.1.0~2359^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25a2336494e1e8478f4e243eb959ca2c40493a0e;p=ceph.git

journal: fix race between player shut down and cache rebalance

Signed-off-by: Mykola Golub <mgolub@suse.com>
---

diff --git a/src/journal/JournalPlayer.cc b/src/journal/JournalPlayer.cc
index 4b68f007e77b..5ac4ebc5dc2a 100644
--- a/src/journal/JournalPlayer.cc
+++ b/src/journal/JournalPlayer.cc
@@ -836,7 +836,7 @@ void JournalPlayer::notify_complete(int r) {
 void JournalPlayer::handle_cache_rebalanced(uint64_t new_cache_bytes) {
   Mutex::Locker locker(m_lock);
 
-  if (m_state == STATE_ERROR) {
+  if (m_state == STATE_ERROR || m_shut_down) {
     return;
   }