From e12db663f02be066caa11610064d1fe9f35bfd85 Mon Sep 17 00:00:00 2001 From: Apoorv Mittal Date: Wed, 15 Jan 2025 16:47:01 +0000 Subject: [PATCH] KAFKA-18514 Remove server dependency on share coordinator (#18536) The PR removes dependency of server module on share-coordinator, rather it should be other way. Moved the ShareCoordinatorConfig class from server to share-coordinator. Reviewers: Ismael Juma , Chia-Ping Tsai --- build.gradle | 2 +- core/src/main/scala/kafka/server/KafkaConfig.scala | 3 ++- .../org/apache/kafka/server/config/AbstractKafkaConfig.java | 1 + .../kafka/coordinator/share}/ShareCoordinatorConfig.java | 2 +- .../kafka/coordinator/share/ShareCoordinatorService.java | 1 - .../apache/kafka/coordinator/share/ShareCoordinatorShard.java | 1 - .../kafka/coordinator/share/ShareCoordinatorShardTest.java | 1 - .../kafka/coordinator/share/ShareCoordinatorTestConfig.java | 1 - 8 files changed, 5 insertions(+), 7 deletions(-) rename {server/src/main/java/org/apache/kafka/server/config => share-coordinator/src/main/java/org/apache/kafka/coordinator/share}/ShareCoordinatorConfig.java (99%) diff --git a/build.gradle b/build.gradle index 66aae7e78fbdc..1806f637407b3 100644 --- a/build.gradle +++ b/build.gradle @@ -974,6 +974,7 @@ project(':server') { implementation project(':group-coordinator') implementation project(':transaction-coordinator') implementation project(':raft') + implementation project(':share-coordinator') implementation libs.jacksonDatabind implementation libs.metrics implementation libs.slf4jApi @@ -1767,7 +1768,6 @@ project(':share-coordinator') { implementation project(':clients') implementation project(':coordinator-common') implementation project(':metadata') - implementation project(':server') implementation project(':server-common') implementation project(':share') implementation libs.metrics diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala index 563ebd603b8af..a8b0cf4328af6 100755 --- a/core/src/main/scala/kafka/server/KafkaConfig.scala +++ b/core/src/main/scala/kafka/server/KafkaConfig.scala @@ -36,6 +36,7 @@ import org.apache.kafka.common.utils.Utils import org.apache.kafka.coordinator.group.Group.GroupType import org.apache.kafka.coordinator.group.modern.share.ShareGroupConfig import org.apache.kafka.coordinator.group.{GroupConfig, GroupCoordinatorConfig} +import org.apache.kafka.coordinator.share.ShareCoordinatorConfig import org.apache.kafka.coordinator.transaction.{TransactionLogConfig, TransactionStateManagerConfig} import org.apache.kafka.network.SocketServerConfigs import org.apache.kafka.raft.QuorumConfig @@ -43,7 +44,7 @@ import org.apache.kafka.security.authorizer.AuthorizerUtils import org.apache.kafka.server.ProcessRole import org.apache.kafka.server.authorizer.Authorizer import org.apache.kafka.server.common.MetadataVersion -import org.apache.kafka.server.config.{AbstractKafkaConfig, DelegationTokenManagerConfigs, KRaftConfigs, QuotaConfig, ReplicationConfigs, ServerConfigs, ServerLogConfigs, ShareCoordinatorConfig, ZkConfigs} +import org.apache.kafka.server.config.{AbstractKafkaConfig, DelegationTokenManagerConfigs, KRaftConfigs, QuotaConfig, ReplicationConfigs, ServerConfigs, ServerLogConfigs, ZkConfigs} import org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig import org.apache.kafka.server.metrics.MetricConfigs import org.apache.kafka.server.util.Csv diff --git a/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java b/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java index 2e03cafe77a19..da9b1cf65fcb7 100644 --- a/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java +++ b/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java @@ -22,6 +22,7 @@ import org.apache.kafka.common.utils.Utils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.coordinator.group.modern.share.ShareGroupConfig; +import org.apache.kafka.coordinator.share.ShareCoordinatorConfig; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.coordinator.transaction.TransactionStateManagerConfig; import org.apache.kafka.network.SocketServerConfigs; diff --git a/server/src/main/java/org/apache/kafka/server/config/ShareCoordinatorConfig.java b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorConfig.java similarity index 99% rename from server/src/main/java/org/apache/kafka/server/config/ShareCoordinatorConfig.java rename to share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorConfig.java index 58bc774fe203b..dcb72672792b4 100644 --- a/server/src/main/java/org/apache/kafka/server/config/ShareCoordinatorConfig.java +++ b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorConfig.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.config; +package org.apache.kafka.coordinator.share; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.config.ConfigDef; diff --git a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java index 71dd2d8805687..b3f8b0c4fba9e 100644 --- a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java +++ b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java @@ -44,7 +44,6 @@ import org.apache.kafka.coordinator.share.metrics.ShareCoordinatorMetrics; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; -import org.apache.kafka.server.config.ShareCoordinatorConfig; import org.apache.kafka.server.record.BrokerCompressionType; import org.apache.kafka.server.share.SharePartitionKey; import org.apache.kafka.server.util.timer.Timer; diff --git a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java index ab867d331aa59..51031faa0a328 100644 --- a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java +++ b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java @@ -49,7 +49,6 @@ import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.server.common.ApiMessageAndVersion; -import org.apache.kafka.server.config.ShareCoordinatorConfig; import org.apache.kafka.server.share.SharePartitionKey; import org.apache.kafka.server.share.persister.PartitionFactory; import org.apache.kafka.server.share.persister.PersisterStateBatch; diff --git a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java index 37e331dceec58..d84347700f18a 100644 --- a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java +++ b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java @@ -39,7 +39,6 @@ import org.apache.kafka.image.TopicImage; import org.apache.kafka.metadata.PartitionRegistration; import org.apache.kafka.server.common.ApiMessageAndVersion; -import org.apache.kafka.server.config.ShareCoordinatorConfig; import org.apache.kafka.server.share.SharePartitionKey; import org.apache.kafka.server.share.persister.PartitionFactory; import org.apache.kafka.server.share.persister.PersisterStateBatch; diff --git a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorTestConfig.java b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorTestConfig.java index 31b5bd88bdb52..75916187b28a0 100644 --- a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorTestConfig.java +++ b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorTestConfig.java @@ -21,7 +21,6 @@ import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.record.CompressionType; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.server.config.ShareCoordinatorConfig; import java.util.Collections; import java.util.HashMap;