From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 23 Nov 2017 06:04:07 +0000 (+0800)
Subject: Merge pull request #18785 from majianpeng/bluestore-remove-collection
X-Git-Tag: v13.0.1~106
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1bfbb528af9a9ff78ef04946f712f95f5aaea597;p=ceph.git

Merge pull request #18785 from majianpeng/bluestore-remove-collection

os/bluestore: avoid omit cache for remove-collection.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

1bfbb528af9a9ff78ef04946f712f95f5aaea597
diff --cc src/os/bluestore/BlueStore.cc
index 67c87692c718,fc75f36e1f9b..b29ee84ac8de
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -6319,11 -6321,11 +6321,11 @@@ void BlueStore::_reap_collections(
  	  if (o->flushing_count.load()) {
  	    dout(10) << __func__ << " " << c << " " << c->cid << " " << o->oid
  		     << " flush_txns " << o->flushing_count << dendl;
 -	    return false;
 +	    return true;
  	  }
 -	  return true;
 +	  return false;
  	})) {
-       all_reaped = false;
+       ++p;
        continue;
      }
      c->onode_map.clear();