Skip to content

Commit 4022d82

Browse files
apoorvmittal10mjsax
authored andcommitted
KAFKA-18514 Remove server dependency on share coordinator (apache#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 <[email protected]>, Chia-Ping Tsai <[email protected]>
1 parent fb96dff commit 4022d82

File tree

8 files changed

+5
-7
lines changed

8 files changed

+5
-7
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1033,6 +1033,7 @@ project(':server') {
10331033
implementation project(':group-coordinator')
10341034
implementation project(':transaction-coordinator')
10351035
implementation project(':raft')
1036+
implementation project(':share-coordinator')
10361037
implementation libs.jacksonDatabind
10371038
implementation libs.metrics
10381039
implementation libs.slf4jApi
@@ -1830,7 +1831,6 @@ project(':share-coordinator') {
18301831
implementation project(':clients')
18311832
implementation project(':coordinator-common')
18321833
implementation project(':metadata')
1833-
implementation project(':server')
18341834
implementation project(':server-common')
18351835
implementation project(':share')
18361836
implementation libs.metrics

core/src/main/scala/kafka/server/KafkaConfig.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ import org.apache.kafka.common.utils.Utils
3636
import org.apache.kafka.coordinator.group.Group.GroupType
3737
import org.apache.kafka.coordinator.group.modern.share.ShareGroupConfig
3838
import org.apache.kafka.coordinator.group.{GroupConfig, GroupCoordinatorConfig}
39+
import org.apache.kafka.coordinator.share.ShareCoordinatorConfig
3940
import org.apache.kafka.coordinator.transaction.{TransactionLogConfig, TransactionStateManagerConfig}
4041
import org.apache.kafka.network.SocketServerConfigs
4142
import org.apache.kafka.raft.QuorumConfig
4243
import org.apache.kafka.security.authorizer.AuthorizerUtils
4344
import org.apache.kafka.server.ProcessRole
4445
import org.apache.kafka.server.authorizer.Authorizer
4546
import org.apache.kafka.server.common.MetadataVersion
46-
import org.apache.kafka.server.config.{AbstractKafkaConfig, DelegationTokenManagerConfigs, KRaftConfigs, QuotaConfig, ReplicationConfigs, ServerConfigs, ServerLogConfigs, ShareCoordinatorConfig, ZkConfigs}
47+
import org.apache.kafka.server.config.{AbstractKafkaConfig, DelegationTokenManagerConfigs, KRaftConfigs, QuotaConfig, ReplicationConfigs, ServerConfigs, ServerLogConfigs, ZkConfigs}
4748
import org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig
4849
import org.apache.kafka.server.metrics.MetricConfigs
4950
import org.apache.kafka.server.util.Csv

server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.kafka.common.utils.Utils;
2323
import org.apache.kafka.coordinator.group.GroupCoordinatorConfig;
2424
import org.apache.kafka.coordinator.group.modern.share.ShareGroupConfig;
25+
import org.apache.kafka.coordinator.share.ShareCoordinatorConfig;
2526
import org.apache.kafka.coordinator.transaction.TransactionLogConfig;
2627
import org.apache.kafka.coordinator.transaction.TransactionStateManagerConfig;
2728
import org.apache.kafka.network.SocketServerConfigs;

server/src/main/java/org/apache/kafka/server/config/ShareCoordinatorConfig.java share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.kafka.server.config;
17+
package org.apache.kafka.coordinator.share;
1818

1919
import org.apache.kafka.common.config.AbstractConfig;
2020
import org.apache.kafka.common.config.ConfigDef;

share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.apache.kafka.coordinator.share.metrics.ShareCoordinatorMetrics;
4545
import org.apache.kafka.image.MetadataDelta;
4646
import org.apache.kafka.image.MetadataImage;
47-
import org.apache.kafka.server.config.ShareCoordinatorConfig;
4847
import org.apache.kafka.server.record.BrokerCompressionType;
4948
import org.apache.kafka.server.share.SharePartitionKey;
5049
import org.apache.kafka.server.util.timer.Timer;

share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.apache.kafka.image.MetadataDelta;
5050
import org.apache.kafka.image.MetadataImage;
5151
import org.apache.kafka.server.common.ApiMessageAndVersion;
52-
import org.apache.kafka.server.config.ShareCoordinatorConfig;
5352
import org.apache.kafka.server.share.SharePartitionKey;
5453
import org.apache.kafka.server.share.persister.PartitionFactory;
5554
import org.apache.kafka.server.share.persister.PersisterStateBatch;

share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.kafka.image.TopicImage;
4040
import org.apache.kafka.metadata.PartitionRegistration;
4141
import org.apache.kafka.server.common.ApiMessageAndVersion;
42-
import org.apache.kafka.server.config.ShareCoordinatorConfig;
4342
import org.apache.kafka.server.share.SharePartitionKey;
4443
import org.apache.kafka.server.share.persister.PartitionFactory;
4544
import org.apache.kafka.server.share.persister.PersisterStateBatch;

share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorTestConfig.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.apache.kafka.common.config.ConfigDef;
2222
import org.apache.kafka.common.record.CompressionType;
2323
import org.apache.kafka.common.utils.Utils;
24-
import org.apache.kafka.server.config.ShareCoordinatorConfig;
2524

2625
import java.util.Collections;
2726
import java.util.HashMap;

0 commit comments

Comments
 (0)