From f5d2bac2ebe22938415f6a591b7e31a9e1284395 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Thu, 22 Feb 2024 17:03:43 +0800 Subject: [PATCH] crimson/os/seastore: fix wrong-positioned asserts Fixes: https://tracker.ceph.com/issues/64535 Signed-off-by: Xuehan Xu (cherry picked from commit b469cbb507675108cecfcfd9da3bd5144deabcf9) --- src/crimson/os/seastore/seastore.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc index eba19eabebe..85a680b2ee2 100644 --- a/src/crimson/os/seastore/seastore.cc +++ b/src/crimson/os/seastore/seastore.cc @@ -725,12 +725,12 @@ SeaStore::Shard::list_objects(CollectionRef ch, LOG_PREFIX(SeaStore::list_objects); DEBUGT("got {} objects, left limit {}", t, next_objects.size(), limit); - if (last && std::get<1>(ret) == pend) { - std::get<1>(ret) = end; - } assert(limit == 0 || std::get<1>(ret) == pend || std::get<1>(ret) == ghobject_t::get_max()); + if (last && std::get<1>(ret) == pend) { + std::get<1>(ret) = end; + } return list_iertr::make_ready_future< seastar::stop_iteration >(seastar::stop_iteration::no); -- 2.39.5