KAFKA-15599: Move KafkaMetadataLog to the raft module (#19762)

- Rename `KafkaMetadataLog` to `KafkaRaftLog`
- Make `raft` depend on `storage`
- Remove `storage` dependency on `metadata` as this otherwise create a
cyclic dependency

Reviewers: Ismael Juma <[email protected]>, Jun Rao <[email protected]>, José Armando García Sancio <[email protected]>, Ziming Deng <[email protected]>

Author: mimaison

build.gradle

@@ -2062,6 +2062,7 @@ project(':clients:clients-integration-tests') {
     testImplementation project(':test-common:test-common-internal-api')
     testImplementation project(':test-common:test-common-runtime')
     testImplementation project(':metadata')
+    testImplementation project(':raft')
     testImplementation project(':server')
     testImplementation project(':storage')
     testImplementation project(':core').sourceSets.test.output
@@ -2098,6 +2099,7 @@ project(':raft') {
   dependencies {
     implementation project(':server-common')
     implementation project(':clients')
+    implementation project(':storage')
     implementation libs.jacksonDatabind
     implementation libs.slf4jApi
 
@@ -2318,7 +2320,6 @@ project(':storage') {
   }
 
   dependencies {
-    implementation project(':metadata')
     implementation project(':storage:storage-api')
     implementation project(':server-common')
     implementation project(':clients')
@@ -3646,6 +3647,7 @@ project(':connect:runtime') {
     testImplementation project(':test-common:test-common-internal-api')
     testImplementation project(':test-common:test-common-util')
     testImplementation project(':test-common:test-common-runtime')
+    testImplementation project(':raft')
     testImplementation project(':server-common')
     testImplementation project(':server')
     testImplementation project(':group-coordinator')
@@ -3874,6 +3876,7 @@ project(':connect:mirror') {
     testImplementation project(':connect:runtime').sourceSets.test.output
     testImplementation project(':core')
     testImplementation project(':test-common:test-common-runtime')
+    testImplementation project(':raft')
     testImplementation project(':server')
     testImplementation project(':server-common')
 

checkstyle/import-control-jmh-benchmarks.xml

@@ -55,4 +55,9 @@
     <allow class="org.apache.kafka.raft.QuorumConfig"/>
     <allow pkg="joptsimple"/>
 
+    <subpackage name="cache">
+    </subpackage>
+    <subpackage name="metadata">
+        <allow class="org.apache.kafka.raft.KRaftConfigs"/>
+    </subpackage>
 </import-control>

checkstyle/import-control-storage.xml

@@ -94,8 +94,6 @@
         <allow pkg="com.yammer.metrics.core" />
         <allow pkg="org.apache.kafka.common" />
         <allow pkg="org.apache.kafka.config" />
-        <allow pkg="org.apache.kafka.image" />
-        <allow pkg="org.apache.kafka.metadata" />
         <allow pkg="org.apache.kafka.server"/>
         <allow pkg="org.apache.kafka.storage.internals"/>
         <allow pkg="org.apache.kafka.storage.log.metrics"/>

checkstyle/import-control.xml

@@ -445,6 +445,7 @@
     <allow class="org.apache.kafka.common.compress.Compression" exact-match="true" />
     <allow pkg="org.apache.kafka.common.config" />
     <allow pkg="org.apache.kafka.common.feature" />
+    <allow pkg="org.apache.kafka.common.internals" />
     <allow pkg="org.apache.kafka.common.message" />
     <allow pkg="org.apache.kafka.common.metadata" />
     <allow pkg="org.apache.kafka.common.metrics" />
@@ -457,7 +458,10 @@
     <allow pkg="org.apache.kafka.server.config" />
     <allow pkg="org.apache.kafka.server.fault"/>
     <allow pkg="org.apache.kafka.server.metrics" />
+    <allow pkg="org.apache.kafka.server.storage.log" />
     <allow pkg="org.apache.kafka.server.util" />
+    <allow pkg="org.apache.kafka.storage.internals.log" />
+    <allow pkg="org.apache.kafka.storage.log.metrics" />
     <allow pkg="org.apache.kafka.test"/>
     <allow pkg="com.fasterxml.jackson" />
     <allow pkg="net.jqwik"/>
@@ -535,6 +539,9 @@
       <allow pkg="org.apache.kafka.server.config" />
       <allow pkg="org.apache.logging.log4j" />
       <allow pkg="kafka.server" />
+      <subpackage name="integration">
+        <allow pkg="org.apache.kafka.raft" />
+      </subpackage>
       <subpackage name="rest">
         <allow pkg="jakarta.ws.rs" />
         <allow pkg="jakarta.inject" />
@@ -618,6 +625,7 @@
       <allow pkg="org.apache.http"/>
       <allow pkg="org.eclipse.jetty.util"/>
       <!-- for tests -->
+      <allow pkg="org.apache.kafka.raft" />
       <allow pkg="org.apache.kafka.server.util" />
       <allow pkg="org.apache.kafka.server.config" />
       <allow pkg="kafka.server"/>

clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/StaticBrokerConfigTest.java

@@ -28,7 +28,7 @@
 import org.apache.kafka.common.test.api.Type;
 import org.apache.kafka.coordinator.group.GroupConfig;
 import org.apache.kafka.coordinator.group.GroupCoordinatorConfig;
-import org.apache.kafka.server.config.KRaftConfigs;
+import org.apache.kafka.raft.KRaftConfigs;
 import org.apache.kafka.server.config.ServerConfigs;
 import org.apache.kafka.server.metrics.ClientMetricsConfigs;
 import org.apache.kafka.storage.internals.log.LogConfig;

clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java

@@ -34,8 +34,8 @@
 import org.apache.kafka.common.test.api.Type;
 import org.apache.kafka.common.utils.LogContext;
 import org.apache.kafka.coordinator.group.GroupCoordinatorConfig;
+import org.apache.kafka.raft.KRaftConfigs;
 import org.apache.kafka.server.IntegrationTestUtils;
-import org.apache.kafka.server.config.KRaftConfigs;
 import org.apache.kafka.server.config.ReplicationConfigs;
 import org.apache.kafka.server.config.ServerConfigs;
 import org.apache.kafka.server.config.ServerLogConfigs;

connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java

@@ -35,7 +35,7 @@
 import org.apache.kafka.connect.mirror.clients.admin.FakeLocalMetadataStore;
 import org.apache.kafka.connect.util.clusters.EmbeddedKafkaCluster;
 import org.apache.kafka.network.SocketServerConfigs;
-import org.apache.kafka.server.config.KRaftConfigs;
+import org.apache.kafka.raft.KRaftConfigs;
 import org.apache.kafka.server.config.ServerConfigs;
 
 import org.junit.jupiter.api.AfterEach;

connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java

@@ -53,7 +53,7 @@
 import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster;
 import org.apache.kafka.connect.util.clusters.EmbeddedKafkaCluster;
 import org.apache.kafka.network.SocketServerConfigs;
-import org.apache.kafka.server.config.KRaftConfigs;
+import org.apache.kafka.raft.KRaftConfigs;
 import org.apache.kafka.server.config.ServerConfigs;
 import org.apache.kafka.test.NoRetryException;