os: make implementation flush before collection_{list,empty}

This takes the (awkward) burden off the caller.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 6c9815ae0912e5e2427ef195b0a7f731a19f2b1a..9b50d6200d007c6ae3e0afea633aefd7fa86982f 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -7234,6 +7234,7 @@ int BlueStore::collection_list(
   vector<ghobject_t> *ls, ghobject_t *pnext)
 {
   Collection *c = static_cast<Collection *>(c_.get());
+  c->flush();
   dout(15) << __func__ << " " << c->cid
            << " start " << start << " end " << end << " max " << max << dendl;
   int r;

diff --git a/src/os/filestore/FileStore.h b/src/os/filestore/FileStore.h
index af479e70753a2c57e173fa75cc2d42e540ec805d..d401909b62847fb287b04a8d493d412d883f7416 100644 (file)
--- a/src/os/filestore/FileStore.h
+++ b/src/os/filestore/FileStore.h
@@ -686,6 +686,7 @@ public:
   int collection_list(CollectionHandle& c,
                      const ghobject_t& start, const ghobject_t& end, int max,
                      vector<ghobject_t> *ls, ghobject_t *next) override {
+    c->flush();
     return collection_list(c->cid, start, end, max, ls, next);
   }
   int collection_list(const coll_t& cid,
@@ -696,6 +697,7 @@ public:
   int collection_stat(const coll_t& c, struct stat *st);
   bool collection_exists(const coll_t& c) override;
   int collection_empty(CollectionHandle& c, bool *empty) override {
+    c->flush();
     return collection_empty(c->cid, empty);
   }
   int collection_empty(const coll_t& cid, bool *empty);

diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
index dce11a5f0e45a8c7daa1201577ca65017146da7a..a0a79274eb88c953d6cbab2e2beb4b2d9e33cf4e 100644 (file)
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -1443,6 +1443,7 @@ int KStore::collection_list(
 
 {
   Collection *c = static_cast<Collection*>(c_.get());
+  c->flush();
   dout(15) << __func__ << " " << c->cid
            << " start " << start << " end " << end << " max " << max << dendl;
   int r;