]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: check max_len with size of an omap entry not a boolean
authorKefu Chai <kchai@redhat.com>
Sun, 20 Dec 2020 13:44:31 +0000 (21:44 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 20 Dec 2020 13:45:39 +0000 (21:45 +0800)
this addresses a regression introduced by
011734d06462e3afac60ed5d3c74dd3b6dc790c6

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/osd/replicated_recovery_backend.cc

index 97b1543461f36e422eead4d4e0306897346638e2..4e1b46a14cceec454852fd0899a87c2ae0d7998e 100644 (file)
@@ -511,8 +511,8 @@ ReplicatedRecoveryBackend::read_omap_for_push_op(
       [omap_iter, &max_len, push_op] {
         push_op->omap_entries.emplace(omap_iter->key(), omap_iter->value());
         if (const uint64_t entry_size =
-            omap_iter->key().size() + omap_iter->value().length() > max_len;
-            entry_size >= max_len) {
+           omap_iter->key().size() + omap_iter->value().length();
+            entry_size > max_len) {
           max_len -= entry_size;
         } else {
           max_len = 0;