]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osd: require an upgrade to hammer first"
authorSage Weil <sage@redhat.com>
Wed, 14 Oct 2015 13:43:53 +0000 (09:43 -0400)
committerSage Weil <sage@redhat.com>
Fri, 16 Oct 2015 18:08:42 +0000 (14:08 -0400)
This reverts commit c0f83df412c962a6b3a2f3cdd1d7c8c795ef1146.

src/osd/OSD.cc

index c46bfb56dc806c12f73d21e40a6c195c1b662d14..38bebd81feb4b8dccefdf017b0032642bda280c5 100644 (file)
@@ -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;