From: Josh Durgin <jdurgin@redhat.com>
Date: Fri, 10 Feb 2017 22:27:14 +0000 (-0800)
Subject: osd: clarify REQUIRE_LUMINOUS error message
X-Git-Tag: v12.0.1~437^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f75e5c99b15f3683f2ed5e13738310ae6745ad55;p=ceph.git

osd: clarify REQUIRE_LUMINOUS error message

This should be visible at the default log level, so users have some
hope of figuring out the problem.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 95b3062e65c9..2782f4789923 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5035,7 +5035,8 @@ void OSD::_preboot(epoch_t oldest, epoch_t newest)
 	    << dendl;
   } else if (!monc->monmap.get_required_features().contains_all(
 	       ceph::features::mon::FEATURE_LUMINOUS)) {
-    dout(1) << "monmap REQUIRE_LUMINOUS is NOT set; upgrade mons first" << dendl;
+    derr << "monmap REQUIRE_LUMINOUS is NOT set; must upgrade all monitors to "
+	 << "Luminous or later before Luminous OSDs will boot" << dendl;
   } else if (osdmap->get_epoch() >= oldest - 1 &&
 	     osdmap->get_epoch() + cct->_conf->osd_map_message_max > newest) {
     _send_boot();