From 199fcefb294c0ab32a0b23a18ac3cbe8a5804683 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Thu, 10 May 2018 12:22:24 +0800 Subject: [PATCH] mds: set could_consume to false when no purge queue item actually executed Fixes: http://tracker.ceph.com/issues/24073 Signed-off-by: Xuehan Xu (cherry picked from commit 46b4e6afa631058fe066bfd58c76d644d5c2181d) --- src/mds/PurgeQueue.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc index e43263ccd7aab..e01e46e4ca47b 100644 --- a/src/mds/PurgeQueue.cc +++ b/src/mds/PurgeQueue.cc @@ -350,7 +350,6 @@ bool PurgeQueue::_consume() bool could_consume = false; while(can_consume()) { - could_consume = true; if (delayed_flush) { // We are now going to read from the journal, so any proactive @@ -376,6 +375,7 @@ bool PurgeQueue::_consume() return could_consume; } + could_consume = true; // The journaler is readable: consume an entry bufferlist bl; bool readable = journaler.try_read_entry(bl); -- 2.39.5