From 4701e8388c2f53c9d75abe237ce4332d768a9a7b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 8 Jul 2010 14:55:53 -0700 Subject: [PATCH] msgr: return error and dethrottle if message decode fails This was broken by the addition of the throttling stuff. Signed-off-by: Sage Weil --- src/msg/SimpleMessenger.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 2db35278cda6b..87b9bf00893f3 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -1790,6 +1790,11 @@ int SimpleMessenger::Pipe::read_message(Message **pm) dout(20) << "reader got " << front.length() << " + " << middle.length() << " + " << data.length() << " byte message" << dendl; message = decode_message(header, footer, front, middle, data); + if (!message) { + ret = -EINVAL; + goto out_dethrottle; + } + message->set_throttler(policy.throttler); // store reservation size in message, so we don't get confused -- 2.39.5