From c5bd0347ccbf70d981f5ab71fcf46cee78c110bb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 13 Jul 2015 10:51:04 -0400 Subject: [PATCH] osd: use bitwise collection_list sort when we don't care Signed-off-by: Sage Weil --- src/osd/OSD.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index acbfcacf0bce..4bc978e8bcc7 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2506,7 +2506,7 @@ void OSD::clear_temp_objects() ghobject_t next; while (1) { vector objects; - store->collection_list(*p, next, ghobject_t::get_max(), + store->collection_list(*p, next, ghobject_t::get_max(), true, store->get_ideal_list_max(), &objects, &next); if (objects.empty()) @@ -2546,7 +2546,8 @@ void OSD::recursive_remove_collection(ObjectStore *store, spg_t pgid, coll_t tmp SnapMapper mapper(&driver, 0, 0, 0, pgid.shard); vector objects; - store->collection_list(tmp, ghobject_t(), ghobject_t::get_max(), INT_MAX, &objects, 0); + store->collection_list(tmp, ghobject_t(), ghobject_t::get_max(), true, + INT_MAX, &objects, 0); // delete them. unsigned removed = 0; @@ -4230,6 +4231,7 @@ bool remove_dir( coll, next, ghobject_t::get_max(), + true, store->get_ideal_list_max(), &olist, &next); -- 2.47.3