]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: fix misc collection_list callers
authorSage Weil <sage@redhat.com>
Mon, 13 Jul 2015 20:37:19 +0000 (16:37 -0400)
committerSage Weil <sage@redhat.com>
Fri, 7 Aug 2015 14:16:00 +0000 (10:16 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/test/objectstore/FileStoreDiff.cc
src/test/objectstore/workload_generator.cc

index fa53d6017ef3f40f7efaa46af24fc89fb5d47517..521e56a5e2e39235ff7518536b588122d5386c59 100644 (file)
@@ -132,13 +132,15 @@ bool FileStoreDiff::diff_objects(FileStore *a_store, FileStore *b_store, coll_t
 
   int err;
   std::vector<ghobject_t> b_objects, a_objects;
-  err = b_store->collection_list(coll, ghobject_t(), ghobject_t::get_max(), INT_MAX, &b_objects, NULL);
+  err = b_store->collection_list(coll, ghobject_t(), ghobject_t::get_max(),
+                                true, INT_MAX, &b_objects, NULL);
   if (err < 0) {
     dout(0) << "diff_objects list on verify coll " << coll.to_str()
            << " returns " << err << dendl;
     return true;
   }
-  err = a_store->collection_list(coll, ghobject_t(), ghobject_t::get_max(), INT_MAX, &a_objects, NULL);
+  err = a_store->collection_list(coll, ghobject_t(), ghobject_t::get_max(),
+                                true, INT_MAX, &a_objects, NULL);
   if (err < 0) {
     dout(0) << "diff_objects list on store coll " << coll.to_str()
               << " returns " << err << dendl;
index 18f1eb71c845782d84029978dc5ed6860aeebf21..4ef5384fc0206a4fdc1f40e32a7dd223494e9e5d 100644 (file)
@@ -353,7 +353,8 @@ void WorkloadGenerator::do_destroy_collection(ObjectStore::Transaction *t,
   m_nr_runs.set(0);
   entry->m_osr.flush();
   vector<ghobject_t> ls;
-  m_store->collection_list(entry->m_coll, ghobject_t(), ghobject_t::get_max(), INT_MAX, &ls, NULL);
+  m_store->collection_list(entry->m_coll, ghobject_t(), ghobject_t::get_max(),
+                          true, INT_MAX, &ls, NULL);
   dout(2) << __func__ << " coll " << entry->m_coll
       << " (" << ls.size() << " objects)" << dendl;