From: Sage Weil <sage@redhat.com>
Date: Sat, 28 Mar 2020 14:20:45 +0000 (-0500)
Subject: osd: remove redundant check
X-Git-Tag: v16.1.0~2624^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c3989c0de6f3fce8e88b346935c77c9d367ec65;p=ceph.git

osd: remove redundant check

This is already covered by the ceph_osd.cc can_upgrade_from() check.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 2308563cbbdd..133ebb984b25 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6306,9 +6306,6 @@ void OSD::_preboot(epoch_t oldest, epoch_t newest)
   } else if (!osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE)) {
     derr << "osdmap SORTBITWISE OSDMap flag is NOT set; please set it"
 	 << dendl;
-  } else if (osdmap->require_osd_release < ceph_release_t::luminous) {
-    derr << "osdmap require_osd_release < luminous; please upgrade to luminous"
-	 << dendl;
   } else if (service.need_fullness_update()) {
     derr << "osdmap fullness state needs update" << dendl;
     send_full_update();