From d59cee0bee653ac77e9613178f888c990cd55da0 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Fri, 31 Jul 2020 16:05:10 +0100 Subject: [PATCH] os/bluestore: fix collection_list properly set next if end reached Previously it was setting it to GMAX (happened when one had end set to not GMAX and max set to INT_MAX). Signed-off-by: Mykola Golub (cherry picked from commit 46d73a806c90b944c8596ad3d9dae3f5cf78d915) --- src/os/bluestore/BlueStore.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index e0b617d6b6f35..95c3c84d765d5 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -8369,6 +8369,10 @@ int BlueStore::_collection_list( dout(20) << __func__ << " oid " << it->oid() << " >= " << pend << dendl; if (temp) { if (end.hobj.is_temp()) { + if (it->valid() && it->key() < temp_end_key) { + *pnext = it->oid(); + set_next = true; + } break; } dout(30) << __func__ << " switch to non-temp namespace" << dendl; @@ -8381,6 +8385,10 @@ int BlueStore::_collection_list( dout(30) << __func__ << " pend " << pend << dendl; continue; } + if (it->valid() && it->key() < end_key) { + *pnext = it->oid(); + set_next = true; + } break; } dout(30) << __func__ << " key " << pretty_binary_string(it->key()) << dendl; -- 2.39.5