kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ij...@apache.org
Subject kafka git commit: KAFKA-4523; Fix crash during shutdown due to group coordinator attempting to write to a closed log
Date Thu, 05 Jan 2017 11:07:20 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk d3572648b -> 77c4eb13a


KAFKA-4523; Fix crash during shutdown due to group coordinator attempting to write to a closed
log

Shut down the group coordinator before shutting down the log manager to
ensure that any delayed operations are completed before the logs are closed.

Author: steve <sniemitz@twitter.com>

Reviewers: Jason Gustafson <jason@confluent.io>, Ismael Juma <ismael@juma.me.uk>

Closes #2311 from steveniemitz/KAFKA-4523


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/77c4eb13
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/77c4eb13
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/77c4eb13

Branch: refs/heads/trunk
Commit: 77c4eb13a4edf82a7fa6850974673eb743c463c9
Parents: d357264
Author: steve <sniemitz@twitter.com>
Authored: Thu Jan 5 11:02:46 2017 +0000
Committer: Ismael Juma <ismael@juma.me.uk>
Committed: Thu Jan 5 11:02:56 2017 +0000

----------------------------------------------------------------------
 core/src/main/scala/kafka/server/KafkaServer.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/77c4eb13/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 d78021f..ef72847 100755
--- a/core/src/main/scala/kafka/server/KafkaServer.scala
+++ b/core/src/main/scala/kafka/server/KafkaServer.scala
@@ -582,10 +582,10 @@ class KafkaServer(val config: KafkaConfig, time: Time = Time.SYSTEM,
threadNameP
           CoreUtils.swallow(replicaManager.shutdown())
         if (adminManager != null)
           CoreUtils.swallow(adminManager.shutdown())
-        if(logManager != null)
-          CoreUtils.swallow(logManager.shutdown())
         if(groupCoordinator != null)
           CoreUtils.swallow(groupCoordinator.shutdown())
+        if(logManager != null)
+          CoreUtils.swallow(logManager.shutdown())
         if(kafkaController != null)
           CoreUtils.swallow(kafkaController.shutdown())
         if(zkUtils != null)


Mime
View raw message