Skip to content

Commit 6c49b32

Browse files
authored
Merge pull request ceph#55705 from xxhdx1985126/wip-64535
crimson/os/seastore: fix wrong-positioned asserts Reviewed-by: Yingxin Cheng <[email protected]>
2 parents 9dd5232 + b469cbb commit 6c49b32

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/crimson/os/seastore/seastore.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -725,12 +725,12 @@ SeaStore::Shard::list_objects(CollectionRef ch,
725725
LOG_PREFIX(SeaStore::list_objects);
726726
DEBUGT("got {} objects, left limit {}",
727727
t, next_objects.size(), limit);
728-
if (last && std::get<1>(ret) == pend) {
729-
std::get<1>(ret) = end;
730-
}
731728
assert(limit == 0 ||
732729
std::get<1>(ret) == pend ||
733730
std::get<1>(ret) == ghobject_t::get_max());
731+
if (last && std::get<1>(ret) == pend) {
732+
std::get<1>(ret) = end;
733+
}
734734
return list_iertr::make_ready_future<
735735
seastar::stop_iteration
736736
>(seastar::stop_iteration::no);

0 commit comments

Comments
 (0)