]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #57314 from Matan-B/wip-55536-squid
authorMatan Breizman <mbreizma@redhat.com>
Wed, 15 May 2024 10:20:41 +0000 (13:20 +0300)
committerGitHub <noreply@github.com>
Wed, 15 May 2024 10:20:41 +0000 (13:20 +0300)
squid: osd/SnapMapper: Crimson - fix OSDriver::get_next

Reviewed-by: Aishwarya Mathuria <amathuri@redhat.com>
1  2 
src/osd/SnapMapper.cc

index 4c8494a19f6f5d4b6c12cde4e608b57affe5815c,0f8b007f0edc5d053b2b818ea1b68e4f1c75af07..aff77ca2409c762069ad88da0d82b61781c57128
@@@ -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] {