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 <me@ewencp.org>
Authored: Fri Oct 17 15:05:46 2014 -0700
Committer: Neha Narkhede <neha.narkhede@gmail.com>
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
}
}
|