summaryrefslogtreecommitdiffstats
path: root/src/os
diff options
context:
space:
mode:
authorSamuel Just <sjust@redhat.com>2023-10-17 06:33:08 +0200
committerSamuel Just <sjust@redhat.com>2023-12-13 21:40:47 +0100
commit40337a8e472579d05a4d1cc44f7248dd1447a982 (patch)
tree3f049481d5835e93cd419f624eb87fc218198597 /src/os
parentMerge pull request #54832 from hex2dec/fix-cephadm-shell-help (diff)
downloadceph-40337a8e472579d05a4d1cc44f7248dd1447a982.tar.xz
ceph-40337a8e472579d05a4d1cc44f7248dd1447a982.zip
os/bluestore/BlueStore: fix crimson-only omap_get_values start handling
seek_to_first() if start is nullopt, upper_bound() otherwise. Introduced: 9cf183ed46ad Fixes: https://tracker.ceph.com/issues/63819 Signed-off-by: Samuel Just <sjust@redhat.com>
Diffstat (limited to 'src/os')
-rw-r--r--src/os/bluestore/BlueStore.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 0f79fc4f095..edc8e7ac264 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -13277,7 +13277,11 @@ int BlueStore::omap_get_values(
r = -ENOENT;
goto out;
}
- iter->upper_bound(*start_after);
+ if (start_after) {
+ iter->upper_bound(*start_after);
+ } else {
+ iter->seek_to_first();
+ }
for (; iter->valid(); iter->next()) {
output->insert(make_pair(iter->key(), iter->value()));
}