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 e67727ee1419e3510e6baadfb44ff9ccd0fa1009..c5cec6d8d98db933ed187d58b54ad5f299ffb896 100644 (file)
--- 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);
   }