]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: fix crush injection error message
authorSage Weil <sage@redhat.com>
Fri, 18 Sep 2015 13:42:47 +0000 (09:42 -0400)
committerLoic Dachary <ldachary@redhat.com>
Wed, 7 Oct 2015 16:09:43 +0000 (18:09 +0200)
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

src/mon/OSDMonitor.cc

index d8470e7435e1343f37033f4227f5c64119ed5bbf..cdbb6c752e9e2eafac585fc6c394602fe4ed2072 100644 (file)
@@ -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;
       }