From: Matan Breizman <mbreizma@redhat.com>
Date: Sun, 28 May 2023 10:31:37 +0000 (+0000)
Subject: crimson/osd/osdmap_gate: got_map() assert increase of current epoch
X-Git-Tag: v18.2.1~175^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=211acc15d567478f7924780994ef2699aadb74c3;p=ceph.git

crimson/osd/osdmap_gate: got_map() assert increase of current epoch

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 06bf66154386662cd7bcccbef6cd7a2bdeb6e539)
---

diff --git a/src/crimson/osd/osdmap_gate.cc b/src/crimson/osd/osdmap_gate.cc
index b1fb669242cde..171ec436d0e22 100644
--- a/src/crimson/osd/osdmap_gate.cc
+++ b/src/crimson/osd/osdmap_gate.cc
@@ -54,6 +54,10 @@ seastar::future<epoch_t> OSDMapGate<OSDMapGateTypeV>::wait_for_map(
 
 template <OSDMapGateType OSDMapGateTypeV>
 void OSDMapGate<OSDMapGateTypeV>::got_map(epoch_t epoch) {
+  if (epoch == 0) {
+    return;
+  }
+  ceph_assert(epoch > current);
   current = epoch;
   auto first = waiting_peering.begin();
   auto last = waiting_peering.upper_bound(epoch);