From: Xuehan Xu <xuxuehan@360.cn>
Date: Thu, 10 May 2018 04:22:24 +0000 (+0800)
Subject: mds: set could_consume to false when no purge queue item actually executed
X-Git-Tag: v14.0.0~149^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21923%2Fhead;p=ceph.git

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 <xuxuehan@360.cn>
---

diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc
index e43263ccd7aa..e01e46e4ca47 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);