From: Sage Weil <sage@redhat.com>
Date: Wed, 14 Oct 2015 13:43:53 +0000 (-0400)
Subject: Revert "osd: require an upgrade to hammer first"
X-Git-Tag: v9.2.0~6^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41c94669a40c1abc8747cb643070ce27447553a7;p=ceph.git

Revert "osd: require an upgrade to hammer first"

This reverts commit c0f83df412c962a6b3a2f3cdd1d7c8c795ef1146.
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c46bfb56dc806..38bebd81feb4b 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1807,13 +1807,6 @@ int OSD::init()
     goto out;
   }
 
-  if (!superblock.compat_features.incompat.contains(CEPH_OSD_FEATURE_INCOMPAT_PGMETA)) {
-    derr << "OSD store does not have PGMETA feature." << dendl;
-    derr << "You must first upgrade to hammer." << dendl;
-    r = -EINVAL;
-    goto out;
-  }
-
   if (osd_compat.compare(superblock.compat_features) < 0) {
     derr << "The disk uses features unsupported by the executable." << dendl;
     derr << " ondisk features " << superblock.compat_features << dendl;