From commits-return-1983-apmail-kafka-commits-archive=kafka.apache.org@kafka.apache.org Fri Oct 17 22:07:06 2014 Return-Path: X-Original-To: apmail-kafka-commits-archive@www.apache.org Delivered-To: apmail-kafka-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CB5E717F70 for ; Fri, 17 Oct 2014 22:07:06 +0000 (UTC) Received: (qmail 52937 invoked by uid 500); 17 Oct 2014 22:07:06 -0000 Delivered-To: apmail-kafka-commits-archive@kafka.apache.org Received: (qmail 52912 invoked by uid 500); 17 Oct 2014 22:07:06 -0000 Mailing-List: contact commits-help@kafka.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kafka.apache.org Delivered-To: mailing list commits@kafka.apache.org Received: (qmail 52903 invoked by uid 99); 17 Oct 2014 22:07:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Oct 2014 22:07:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 673FD99AFD4; Fri, 17 Oct 2014 22:07:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nehanarkhede@apache.org To: commits@kafka.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: KAFKA-1108 When controlled shutdown attempt fails, the reason is not always logged; reviewed by Neha Narkhede Date: Fri, 17 Oct 2014 22:07:06 +0000 (UTC) Repository: kafka Updated Branches: refs/heads/0.8.2 5771f15f5 -> 91d828a1a KAFKA-1108 When controlled shutdown attempt fails, the reason is not always logged; reviewed by Neha Narkhede Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/91d828a1 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/91d828a1 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/91d828a1 Branch: refs/heads/0.8.2 Commit: 91d828a1a511c7a96b2eee1197e871215c6c62c0 Parents: 5771f15 Author: Ewen Cheslack-Postava Authored: Fri Oct 17 15:05:46 2014 -0700 Committer: Neha Narkhede Committed: Fri Oct 17 15:05:50 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/kafka/server/KafkaServer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/91d828a1/core/src/main/scala/kafka/server/KafkaServer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/server/KafkaServer.scala b/core/src/main/scala/kafka/server/KafkaServer.scala index 07c0a07..4de8123 100644 --- a/core/src/main/scala/kafka/server/KafkaServer.scala +++ b/core/src/main/scala/kafka/server/KafkaServer.scala @@ -220,7 +220,6 @@ class KafkaServer(val config: KafkaConfig, time: Time = SystemTime) extends Logg channel.send(request) response = channel.receive() - val shutdownResponse = ControlledShutdownResponse.readFrom(response.buffer) if (shutdownResponse.errorCode == ErrorMapping.NoError && shutdownResponse.partitionsRemaining != null && shutdownResponse.partitionsRemaining.size == 0) { @@ -236,6 +235,7 @@ class KafkaServer(val config: KafkaConfig, time: Time = SystemTime) extends Logg case ioe: java.io.IOException => channel.disconnect() channel = null + warn("Error during controlled shutdown, possibly because leader movement took longer than the configured socket.timeout.ms: %s".format(ioe.getMessage)) // ignore and try again } }