root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

KAFKA-4227; Shutdown AdminManager when KafkaServer is shutdown 

Terminate topic purgatory thread in AdminManager during server shutdown to avoid threads being left around in unit tests.

Author: Rajini Sivaram <rajinisivaram@googlemail.com>

Reviewers: Ismael Juma <ismael@juma.me.uk>

Closes #1927 from rajinisivaram/KAFKA-4227
This commit is contained in:
Rajini Sivaram 2016-09-28 20:18:20 +01:00 committed by Ismael Juma
parent d83cde7cab
commit 281fac9ed6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/scala/kafka/server/AdminManager.scala
View File

@ -155,4 +155,8 @@ class AdminManager(val config: KafkaConfig,
topicPurgatory.tryCompleteElseWatch(delayedDelete, delayedDeleteKeys) topicPurgatory.tryCompleteElseWatch(delayedDelete, delayedDeleteKeys)
} }
} }
def shutdown() {
topicPurgatory.shutdown()
}
} }

2
core/src/main/scala/kafka/server/KafkaServer.scala
View File

@ -589,6 +589,8 @@ class KafkaServer(val config: KafkaConfig, time: Time = SystemTime, threadNamePr
CoreUtils.swallow(authorizer.foreach(_.close())) CoreUtils.swallow(authorizer.foreach(_.close()))
if(replicaManager != null) if(replicaManager != null)
CoreUtils.swallow(replicaManager.shutdown()) CoreUtils.swallow(replicaManager.shutdown())
if (adminManager != null)
CoreUtils.swallow(adminManager.shutdown())
if(logManager != null) if(logManager != null)
CoreUtils.swallow(logManager.shutdown()) CoreUtils.swallow(logManager.shutdown())
if(groupCoordinator != null) if(groupCoordinator != null)