From: Sage Weil <sage@redhat.com>
Date: Wed, 14 Oct 2015 13:44:06 +0000 (-0400)
Subject: Revert "os/FileStore: require upgrade to hammer before moving beyond"
X-Git-Tag: v9.2.0~6^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52b79f7113be53a56d76d6f9be90d17273accb85;p=ceph.git

Revert "os/FileStore: require upgrade to hammer before moving beyond"

This reverts commit 10cb507d9d52464b2fd28b3cc84a92328944e462.
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index b2d80fc9edf2c..3e8bb29fcc4e1 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1212,8 +1212,8 @@ int FileStore::upgrade()
   if (r == 1)
     return 0;
 
-  if (version < 4) {
-    derr << "ObjectStore is old at version " << version << ".  Please upgrade to hammer v0.94.x first."  << dendl;
+  if (version < 3) {
+    derr << "ObjectStore is old at version " << version << ".  Please upgrade to firefly v0.80.x, convert your store, and then upgrade."  << dendl;
     return -EINVAL;
   }