]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #18785 from majianpeng/bluestore-remove-collection
authorKefu Chai <tchaikov@gmail.com>
Thu, 23 Nov 2017 06:04:07 +0000 (14:04 +0800)
committerGitHub <noreply@github.com>
Thu, 23 Nov 2017 06:04:07 +0000 (14:04 +0800)
os/bluestore: avoid omit cache for remove-collection.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
1  2 
src/os/bluestore/BlueStore.cc

index 67c87692c718ce578bdf1b50a5b2ad07645121ac,fc75f36e1f9b4e83aa9c8b7e91f08afdbaf745a4..b29ee84ac8de501f85798663ea7dbe43f9e81e61
@@@ -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();