]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: Fix key num handling in PGBackend::omap_get_vals()
authorAmnon Hanuhov <ahanukov@redhat.com>
Wed, 27 May 2020 10:03:30 +0000 (13:03 +0300)
committerAmnon Hanuhov <ahanukov@redhat.com>
Wed, 24 Jun 2020 13:18:34 +0000 (16:18 +0300)
Signed-off-by: Amnon Hanuhov <ahanukov@redhat.com>
src/crimson/osd/pg_backend.cc

index 494d0ea024e6d62e66523ccd850e55f7d1af7c1f..bce6187a889163927ec7b0355fc9d897ac1286e6 100644 (file)
@@ -615,13 +615,14 @@ seastar::future<> PGBackend::omap_get_vals(
         const auto& [key, value] = *iter;
         if (key.substr(0, filter_prefix.size()) != filter_prefix) {
           break;
-        } else if (num++ >= max_return ||
+        } else if (num >= max_return ||
             result.length() >= local_conf()->osd_max_omap_bytes_per_request) {
           truncated = true;
           break;
         }
         encode(key, result);
         encode(value, result);
+        ++num;
       }
       encode(num, osd_op.outdata);
       osd_op.outdata.claim_append(result);