From: Sage Weil <sage@inktank.com>
Date: Wed, 12 Feb 2014 21:18:04 +0000 (-0800)
Subject: mon/OSDMonitor: fix legacy tunables warning
X-Git-Tag: v0.78~191
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af4c142d95ed12c46a44dd1dd6d17f3385acc09c;p=ceph.git

mon/OSDMonitor: fix legacy tunables warning

Warn on legacy tunables, not on non-optimal tunables.  Optimal is a moving
target, but it is really the legacy defaults that we want to push people
off of.

Fixes: #7399
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9d5ee1cbcf1b..a3ff89abedcb 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2010,9 +2010,9 @@ void OSDMonitor::get_health(list<pair<health_status_t,string> >& summary,
 
     // old crush tunables?
     if (g_conf->mon_warn_on_legacy_crush_tunables) {
-      if (!osdmap.crush->has_optimal_tunables()) {
+      if (osdmap.crush->has_legacy_tunables()) {
 	ostringstream ss;
-	ss << "crush map has non-optimal tunables";
+	ss << "crush map has legacy tunables";
 	summary.push_back(make_pair(HEALTH_WARN, ss.str()));
 	if (detail) {
 	  ss << "; see http://ceph.com/docs/master/rados/operations/crush-map/#tunables";