]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PeeringState: drop mimic assert 34204/head
authorSage Weil <sage@redhat.com>
Wed, 25 Mar 2020 22:13:46 +0000 (17:13 -0500)
committerKefu Chai <kchai@redhat.com>
Thu, 26 Mar 2020 10:35:10 +0000 (18:35 +0800)
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>
(cherry picked from commit 29b7469fb7196f0ce7b2ae5d0a21226ab15ba306)

src/osd/PeeringState.cc

index 685334cc09abef2ab8ec53d68676b4fbdba81e4a..52c91ea43ed16ff279c961bd1824926bf73f3c13 100644 (file)
@@ -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();
   }