From: Laura Flores <lflores@redhat.com>
Date: Wed, 14 Sep 2022 20:38:57 +0000 (-0500)
Subject: Revert "osd/PeeringState: proc_lease_ack break once found from OSD"
X-Git-Tag: v17.2.6~505^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1afc7b9973fcbc7d6604be32860ea6e2c2746c70;p=ceph.git

Revert "osd/PeeringState: proc_lease_ack break once found from OSD"

This reverts commit 0d07b406dc2f854363f7ae9b970e980400f4f03e.

This commit caused a regression in the rados suite, as evidenced by:

- with the commit:
http://pulpito.front.sepia.ceph.com/lflores-2022-09-14_15:11:39-rados-quincy-release-distro-default-smithi/

- with the commit reverted:
http://pulpito.front.sepia.ceph.com/lflores-2022-09-14_17:02:02-rados-wip-lflores-testing-quincy-release-distro-default-smithi/

Fixes: https://tracker.ceph.com/issues/57546
Signed-off-by: Laura Flores <lflores@redhat.com>
---

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 19abf2021e3f3..8ad0a08e9b4c2 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -1213,8 +1213,8 @@ void PeeringState::proc_lease_ack(int from, const pg_lease_ack_t& a)
 	  was_min = true;
 	}
 	acting_readable_until_ub[i] = a.readable_until_ub;
+	break;
       }
-      break;
     }
   }
   if (was_min) {