From: Sage Weil <sage@redhat.com>
Date: Mon, 11 Feb 2019 15:32:40 +0000 (-0600)
Subject: ceph-osd: be helpful about upgrade gate
X-Git-Tag: v14.1.0~94^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26345%2Fhead;p=ceph.git

ceph-osd: be helpful about upgrade gate

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

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index e67727ee1419..c5cec6d8d98d 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -477,8 +477,15 @@ flushjournal_out:
   if (require_osd_release > 0 &&
       require_osd_release + 2 < (int)ceph_release()) {
     derr << "OSD's recorded require_osd_release " << require_osd_release
-	 << " + 2 < this release " << ceph_release()
-	 << "; you can only upgrade 2 releases at a time" << dendl;
+	 << " (" << ceph_release_name(require_osd_release)
+	 << ") is >2 releases older than installed " << ceph_release()
+	 << " (" << ceph_release_name(ceph_release())
+	 << "); you can only upgrade 2 releases at a time" << dendl;
+    derr << "you should first upgrade to "
+	 << (require_osd_release + 1)
+	 << " (" << ceph_release_name(require_osd_release + 1) << ") or "
+	 << (require_osd_release + 2)
+	 << " (" << ceph_release_name(require_osd_release + 2) << ")" << dendl;
     forker.exit(1);
   }