From 25bd2778f8b7f5eb5245efebca56a7348dd064eb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 18 Sep 2015 09:42:47 -0400 Subject: [PATCH] mon/OSDMonitor: fix crush injection error message Signed-off-by: Sage Weil (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 --- src/mon/OSDMonitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index d8470e7435e13..cdbb6c752e9e2 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; } -- 2.39.5