From 92ebf0d43d631ba9ec47c72e4c881ab411e42673 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Mon, 8 May 2023 15:04:40 +0800 Subject: [PATCH] fix compilation failure --- core/src/main/scala/kafka/raft/RaftManager.scala | 1 - core/src/main/scala/kafka/server/KafkaServer.scala | 4 ++-- core/src/main/scala/kafka/tools/TestRaftServer.scala | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/kafka/raft/RaftManager.scala b/core/src/main/scala/kafka/raft/RaftManager.scala index 33dc1dc1e26d..5730f62055b8 100644 --- a/core/src/main/scala/kafka/raft/RaftManager.scala +++ b/core/src/main/scala/kafka/raft/RaftManager.scala @@ -47,7 +47,6 @@ import org.apache.kafka.common.utils.{LogContext, Time} import org.apache.kafka.raft.RaftConfig.{AddressSpec, InetAddressSpec, NON_ROUTABLE_ADDRESS, UnknownAddressSpec} import org.apache.kafka.raft.{FileBasedStateStore, KafkaRaftClient, LeaderAndEpoch, RaftClient, RaftConfig, RaftRequest, ReplicatedLog} import org.apache.kafka.server.common.serialization.RecordSerde -import org.apache.kafka.server.util.KafkaScheduler import org.apache.kafka.server.fault.FaultHandler import scala.jdk.CollectionConverters._ diff --git a/core/src/main/scala/kafka/server/KafkaServer.scala b/core/src/main/scala/kafka/server/KafkaServer.scala index d602e53fe7d4..b395c3eef06f 100755 --- a/core/src/main/scala/kafka/server/KafkaServer.scala +++ b/core/src/main/scala/kafka/server/KafkaServer.scala @@ -53,7 +53,7 @@ import org.apache.kafka.raft.RaftConfig import org.apache.kafka.server.authorizer.Authorizer import org.apache.kafka.server.common.{ApiMessageAndVersion, MetadataVersion} import org.apache.kafka.server.common.MetadataVersion._ -import org.apache.kafka.server.fault.ProcessExitingFaultHandler +import org.apache.kafka.server.fault.ProcessTerminatingFaultHandler import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.zookeeper.client.ZKClientConfig @@ -388,7 +388,7 @@ class KafkaServer( metrics, threadNamePrefix, controllerQuorumVotersFuture, - fatalFaultHandler = new ProcessExitingFaultHandler() + fatalFaultHandler = new ProcessTerminatingFaultHandler.Builder().build() ) val controllerNodes = RaftConfig.voterConnectionsToNodes(controllerQuorumVotersFuture.get()).asScala val quorumControllerNodeProvider = RaftControllerNodeProvider(raftManager, config, controllerNodes) diff --git a/core/src/main/scala/kafka/tools/TestRaftServer.scala b/core/src/main/scala/kafka/tools/TestRaftServer.scala index 47ba5a747e15..409531aab24b 100644 --- a/core/src/main/scala/kafka/tools/TestRaftServer.scala +++ b/core/src/main/scala/kafka/tools/TestRaftServer.scala @@ -38,7 +38,7 @@ import org.apache.kafka.common.{TopicPartition, Uuid, protocol} import org.apache.kafka.raft.errors.NotLeaderException import org.apache.kafka.raft.{Batch, BatchReader, LeaderAndEpoch, RaftClient, RaftConfig} import org.apache.kafka.server.common.serialization.RecordSerde -import org.apache.kafka.server.fault.ProcessExitingFaultHandler +import org.apache.kafka.server.fault.ProcessTerminatingFaultHandler import org.apache.kafka.snapshot.SnapshotReader import scala.jdk.CollectionConverters._ @@ -91,7 +91,7 @@ class TestRaftServer( metrics, Some(threadNamePrefix), CompletableFuture.completedFuture(RaftConfig.parseVoterConnections(config.quorumVoters)), - new ProcessExitingFaultHandler() + new ProcessTerminatingFaultHandler.Builder().build() ) workloadGenerator = new RaftWorkloadGenerator(