From: Sage Weil Date: Wed, 7 Sep 2016 14:32:50 +0000 (-0400) Subject: os/bluestore: assert shared blob cache cleared on split X-Git-Tag: v11.0.1~304^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F10963%2Fhead;p=ceph.git os/bluestore: assert shared blob cache cleared on split Signed-off-by: Sage Weil --- diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 98c85d0b8536..f09b22faeaba 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -8215,7 +8215,9 @@ int BlueStore::_split_collection(TransContext *txc, // blow away the caches. FIXME. c->onode_map.clear(); d->onode_map.clear(); -#warning assert that shared_blob cache (and others?) are also cleared.. + + assert(c->shared_blob_set.empty()); + assert(d->shared_blob_set.empty()); c->cnode.bits = bits; assert(d->cnode.bits == bits); diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 0c5590b7703f..eac753e766b9 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -376,6 +376,10 @@ public: } return false; } + + bool empty() { + return uset.empty(); + } }; /// in-memory blob metadata and associated cached buffers (if any)