From: Sage Weil <sage@redhat.com>
Date: Fri, 18 Sep 2015 13:42:47 +0000 (-0400)
Subject: mon/OSDMonitor: fix crush injection error message
X-Git-Tag: v0.94.4~15^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25bd2778f8b7f5eb5245efebca56a7348dd064eb;p=ceph.git

mon/OSDMonitor: fix crush injection error message

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1b3090d50e5bd5ca3e6e396b23d2d9826896c718)

Conflicts:
	src/mon/OSDMonitor.cc
	  hammer has a separate error message for EINTR
	  which is in the context of the fix for error message
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index d8470e7435e1..cdbb6c752e9e 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4601,7 +4601,7 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m,
 	ss << "(note: crushtool tests not run because they took too long) ";
       } else {
 	derr << "error on crush map: " << ess.str() << dendl;
-	ss << "Failed to parse crushmap: " << ess.str();
+	ss << "Failed crushmap test: " << ess.str();
 	err = r;
 	goto reply;
       }