From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Mar 2020 22:13:46 +0000 (-0500)
Subject: osd/PeeringState: drop mimic assert
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1719^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=29b7469fb7196f0ce7b2ae5d0a21226ab15ba306;p=ceph-ci.git

osd/PeeringState: drop mimic assert

This code can still execute for a cluster that has require_osd_release >=
nautilus because a PG is processing an older OSDMap.  Drop this assert
since the osd boot checks on require_osd_release are sufficient.

Fixes: https://tracker.ceph.com/issues/44759
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 685334cc09a..52c91ea43ed 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -106,7 +106,6 @@ void PGPool::update(CephContext *cct, OSDMapRef map)
     updated = true;
   }
 
-  assert(map->require_osd_release >= ceph_release_t::mimic);
   if (info.is_pool_snaps_mode() && updated) {
     snapc = pi->get_snap_context();
   }