From: Matan Breizman <mbreizma@redhat.com>
Date: Wed, 15 May 2024 10:20:41 +0000 (+0300)
Subject: Merge pull request #57314 from Matan-B/wip-55536-squid
X-Git-Tag: v19.1.1~390
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07b127ece5ad5a19805fb57cfb6352c635507b7c;p=ceph.git

Merge pull request #57314 from Matan-B/wip-55536-squid

squid: osd/SnapMapper: Crimson - fix OSDriver::get_next

Reviewed-by: Aishwarya Mathuria <amathuri@redhat.com>
---

07b127ece5ad5a19805fb57cfb6352c635507b7c
diff --cc src/osd/SnapMapper.cc
index 4c8494a19f6f5,0f8b007f0edc5..aff77ca2409c7
--- 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] {