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

KAFKA-18758: NullPointerException in shutdown following InvalidConfigurationException (#18833) 

* KAFKA-18758:  NullPointerException in shutdown following InvalidConfigurationException

Add checks for null in shutdown as BrokerLifecycleManager is not instantiaited if LogManager constructor throws an Exception
This commit is contained in:
Edoardo Comar 2025-02-11 10:06:55 +00:00 committed by GitHub
parent 675a0889de
commit 7e405ccc65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/scala/kafka/server/BrokerServer.scala
View File

@ -748,6 +748,7 @@ class BrokerServer(
if (replicaManager != null)
replicaManager.beginControlledShutdown()
if (lifecycleManager != null) {
lifecycleManager.beginControlledShutdown()
try {
val controlledShutdownTimeoutMs = deadline - time.milliseconds()
@ -759,7 +760,10 @@ class BrokerServer(
error("Got unexpected exception waiting for controlled shutdown future", e)
}
}
}
if (lifecycleManager != null)
lifecycleManager.beginShutdown()
// Stop socket server to stop accepting any more connections and requests.
// Socket server will be shutdown towards the end of the sequence.
if (socketServer != null) {
@ -811,8 +815,10 @@ class BrokerServer(
if (clientToControllerChannelManager != null)
CoreUtils.swallow(clientToControllerChannelManager.shutdown(), this)
if (logManager != null)
CoreUtils.swallow(logManager.shutdown(lifecycleManager.brokerEpoch), this)
if (logManager != null) {
val brokerEpoch = if (lifecycleManager != null) lifecycleManager.brokerEpoch else -1
CoreUtils.swallow(logManager.shutdown(brokerEpoch), this)
}
// Close remote log manager to give a chance to any of its underlying clients
// (especially in RemoteStorageManager and RemoteLogMetadataManager) to close gracefully.
@ -832,7 +838,9 @@ class BrokerServer(
isShuttingDown.set(false)
if (lifecycleManager != null)
CoreUtils.swallow(lifecycleManager.close(), this)
CoreUtils.swallow(config.dynamicConfig.clear(), this)
Utils.closeQuietly(clientMetricsManager, "client metrics manager")
sharedServer.stopForBroker()