From 5105b144b5dc0611e8c0263f48c1dc977ece74b6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 11 Feb 2019 09:32:40 -0600 Subject: [PATCH] ceph-osd: be helpful about upgrade gate Signed-off-by: Sage Weil --- src/ceph_osd.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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); } -- 2.47.3