From: Matan Breizman <mbreizma@redhat.com>
Date: Wed, 6 Mar 2024 13:19:40 +0000 (+0200)
Subject: Merge pull request #55536 from Matan-B/wip-crimson-snapmapper-get_next
X-Git-Tag: v20.0.0~2463
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=602578935b47209e67a851af544e2b2746187dcd;p=ceph.git

Merge pull request #55536 from Matan-B/wip-crimson-snapmapper-get_next

osd/SnapMapper: Crimson - fix OSDriver::get_next

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: chunmei-liu <chunmei.liu@intel.com>
---

602578935b47209e67a851af544e2b2746187dcd
diff --cc src/osd/SnapMapper.cc
index fa31cd76a368,8f1be7052693..c16848272209
--- a/src/osd/SnapMapper.cc
+++ b/src/osd/SnapMapper.cc
@@@ -146,8 -145,9 +145,9 @@@ int OSDriver::get_next_or_current
    return interruptor::green_get(os->omap_get_values(
      ch, hoid, FuturizedStore::Shard::omap_keys_t{key}
    ).safe_then([&key, next_or_current] (FuturizedStore::Shard::omap_values_t&& vals) {
+     CRIMSON_DEBUG("OSDriver::get_next_or_current returning {}", key);
      assert(vals.size() == 1);
 -    *next_or_current = std::make_pair(key, std::move(vals[0]));
 +    *next_or_current = std::make_pair(key, std::move(vals.begin()->second));
      return 0;
    }, FuturizedStore::Shard::read_errorator::all_same_way(
      [next_or_current, &key, this] {