]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
journal: fix race between player shut down and cache rebalance
authorMykola Golub <mgolub@suse.com>
Tue, 25 Jun 2019 16:55:40 +0000 (17:55 +0100)
committerMykola Golub <mgolub@suse.com>
Tue, 25 Jun 2019 17:02:49 +0000 (18:02 +0100)
Signed-off-by: Mykola Golub <mgolub@suse.com>
src/journal/JournalPlayer.cc

index 4b68f007e77b76b1aea8d90f284b91a881eaab4a..5ac4ebc5dc2a7d3bd8a8e7922f25d1cc8bde6ac0 100644 (file)
@@ -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;
   }