Skip to content

KAFKA-20025: enable dynamic TLS reconfiguration for KafkaRaftManager #21333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeroen92 wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

KAFKA-20025: enable dynamic TLS reconfiguration for KafkaRaftManager #21333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions core/src/main/scala/kafka/raft/KafkaRaftManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import kafka.utils.CoreUtils
import kafka.utils.Logging
import org.apache.kafka.clients.{ApiVersions, ManualMetadataUpdater, MetadataRecoveryStrategy, NetworkClient}
import org.apache.kafka.common.KafkaException
import org.apache.kafka.common.Reconfigurable
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.Uuid
import org.apache.kafka.common.metrics.Metrics
Expand Down Expand Up @@ -217,6 +218,15 @@ class KafkaRaftManager[T](
logContext
)

// Register the channel builder as Reconfigurable to enable dynamic SSL updates
channelBuilder match {
case reconfigurable: Reconfigurable =>
config.addReconfigurable(reconfigurable)
info(s"Registered Raft channel builder for dynamic reconfiguration with listener ${controllerListenerName}")
case _ =>
warn(s"Raft channel builder does not support dynamic reconfiguration")
}

val metricGroupPrefix = "raft-channel"
val collectPerConnectionMetrics = false

Expand Down
9 changes: 8 additions & 1 deletion core/src/main/scala/kafka/server/SharedServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,16 @@ class SharedServer(

val externalKRaftMetrics = new DefaultExternalKRaftMetrics(Optional.ofNullable(brokerMetrics), Optional.ofNullable(controllerServerMetrics))

// Enable propagation of dynamic config changes to the KafkaRaftManager
val raftManagerConfig = if (sharedServerConfig.processRoles.contains(ProcessRole.ControllerRole)) {
controllerConfig
} else {
brokerConfig
}

val _raftManager = new KafkaRaftManager[ApiMessageAndVersion](
clusterId,
sharedServerConfig,
raftManagerConfig,
metaPropsEnsemble.logDirProps.get(metaPropsEnsemble.metadataLogDir.get).directoryId.get,
new MetadataRecordSerde,
KafkaRaftServer.MetadataPartition,
Expand Down