This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 68800a027b7 KAFKA-19301 Move partition state classes from storage to
server module (#20831)
68800a027b7 is described below
commit 68800a027b70ab9a34a79aa779a1eefcbbba684c
Author: Chih-Yuan Chien <[email protected]>
AuthorDate: Sun Nov 9 23:21:32 2025 +0800
KAFKA-19301 Move partition state classes from storage to server module
(#20831)
Follow up to the discussion in #20083.
Move partition state management classes from
`org.apache.kafka.storage.internals.log` to
`org.apache.kafka.server.partition` package.
Reviewers: Chia-Ping Tsai <[email protected]>
---
core/src/main/java/kafka/server/share/SharePartitionManager.java | 2 +-
core/src/main/scala/kafka/cluster/Partition.scala | 3 ++-
.../scala/kafka/coordinator/group/CoordinatorPartitionWriter.scala | 3 ++-
core/src/main/scala/kafka/server/ReplicaManager.scala | 5 +++--
core/src/test/scala/unit/kafka/cluster/AbstractPartitionTest.scala | 3 ++-
core/src/test/scala/unit/kafka/cluster/AssignmentStateTest.scala | 2 +-
core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala | 3 ++-
core/src/test/scala/unit/kafka/cluster/PartitionTest.scala | 3 ++-
.../apache/kafka/jmh/partition/PartitionMakeFollowerBenchmark.java | 2 +-
.../kafka/jmh/partition/UpdateFollowerFetchStateBenchmark.java | 2 +-
.../org/apache/kafka/server/partition}/AlterPartitionListener.java | 2 +-
.../java/org/apache/kafka/server/partition}/AssignmentState.java | 2 +-
.../org/apache/kafka/server/partition}/CommittedPartitionState.java | 2 +-
.../org/apache/kafka/server/partition}/OngoingReassignmentState.java | 2 +-
.../java/org/apache/kafka/server/partition}/PartitionListener.java | 2 +-
.../main/java/org/apache/kafka/server/partition}/PartitionState.java | 2 +-
.../java/org/apache/kafka/server/partition}/PendingExpandIsr.java | 2 +-
.../org/apache/kafka/server/partition}/PendingPartitionChange.java | 2 +-
.../java/org/apache/kafka/server/partition}/PendingShrinkIsr.java | 2 +-
.../org/apache/kafka/server/partition}/SimpleAssignmentState.java | 2 +-
20 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/core/src/main/java/kafka/server/share/SharePartitionManager.java
b/core/src/main/java/kafka/server/share/SharePartitionManager.java
index 854a5de2a4d..095fe2956b6 100644
--- a/core/src/main/java/kafka/server/share/SharePartitionManager.java
+++ b/core/src/main/java/kafka/server/share/SharePartitionManager.java
@@ -33,6 +33,7 @@ import
org.apache.kafka.common.utils.ImplicitLinkedHashCollection;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.coordinator.group.GroupConfigManager;
import org.apache.kafka.server.common.ShareVersion;
+import org.apache.kafka.server.partition.PartitionListener;
import org.apache.kafka.server.share.CachedSharePartition;
import org.apache.kafka.server.share.ShareGroupListener;
import org.apache.kafka.server.share.SharePartitionKey;
@@ -57,7 +58,6 @@ import org.apache.kafka.server.util.timer.SystemTimer;
import org.apache.kafka.server.util.timer.SystemTimerReaper;
import org.apache.kafka.server.util.timer.Timer;
import org.apache.kafka.server.util.timer.TimerTask;
-import org.apache.kafka.storage.internals.log.PartitionListener;
import org.apache.kafka.storage.log.metrics.BrokerTopicStats;
import org.slf4j.Logger;
diff --git a/core/src/main/scala/kafka/cluster/Partition.scala
b/core/src/main/scala/kafka/cluster/Partition.scala
index 76bc41ca29b..eaf0e53924d 100755
--- a/core/src/main/scala/kafka/cluster/Partition.scala
+++ b/core/src/main/scala/kafka/cluster/Partition.scala
@@ -41,8 +41,9 @@ import org.apache.kafka.metadata.{LeaderAndIsr,
LeaderRecoveryState, MetadataCac
import org.apache.kafka.server.common.RequestLocal
import org.apache.kafka.server.log.remote.TopicPartitionLog
import org.apache.kafka.server.log.remote.storage.RemoteLogManager
-import org.apache.kafka.storage.internals.log.{AlterPartitionListener,
AppendOrigin, AssignmentState, AsyncOffsetReader, CommittedPartitionState,
FetchDataInfo, LeaderHwChange, LogAppendInfo, LogOffsetMetadata,
LogOffsetSnapshot, LogOffsetsListener, LogReadInfo,
LogStartOffsetIncrementReason, OffsetResultHolder, OngoingReassignmentState,
PartitionListener, PartitionState, PendingExpandIsr, PendingPartitionChange,
PendingShrinkIsr, SimpleAssignmentState, UnifiedLog, VerificationGuard}
+import org.apache.kafka.storage.internals.log.{AppendOrigin,
AsyncOffsetReader, FetchDataInfo, LeaderHwChange, LogAppendInfo,
LogOffsetMetadata, LogOffsetSnapshot, LogOffsetsListener, LogReadInfo,
LogStartOffsetIncrementReason, OffsetResultHolder, UnifiedLog,
VerificationGuard}
import org.apache.kafka.server.metrics.KafkaMetricsGroup
+import org.apache.kafka.server.partition.{AlterPartitionListener,
AssignmentState, CommittedPartitionState, OngoingReassignmentState,
PartitionListener, PartitionState, PendingExpandIsr, PendingPartitionChange,
PendingShrinkIsr, SimpleAssignmentState}
import org.apache.kafka.server.purgatory.{DelayedDeleteRecords,
DelayedOperationPurgatory, TopicPartitionOperationKey}
import org.apache.kafka.server.replica.Replica
import org.apache.kafka.server.share.fetch.DelayedShareFetchPartitionKey
diff --git
a/core/src/main/scala/kafka/coordinator/group/CoordinatorPartitionWriter.scala
b/core/src/main/scala/kafka/coordinator/group/CoordinatorPartitionWriter.scala
index 104f2893f7e..afd5124dcff 100644
---
a/core/src/main/scala/kafka/coordinator/group/CoordinatorPartitionWriter.scala
+++
b/core/src/main/scala/kafka/coordinator/group/CoordinatorPartitionWriter.scala
@@ -23,8 +23,9 @@ import org.apache.kafka.common.record.{MemoryRecords,
RecordBatch}
import org.apache.kafka.coordinator.common.runtime.PartitionWriter
import org.apache.kafka.server.ActionQueue
import org.apache.kafka.server.common.RequestLocal
+import org.apache.kafka.server.partition.PartitionListener
import org.apache.kafka.server.transaction.AddPartitionsToTxnManager
-import org.apache.kafka.storage.internals.log.{AppendOrigin, LogConfig,
PartitionListener, VerificationGuard}
+import org.apache.kafka.storage.internals.log.{AppendOrigin, LogConfig,
VerificationGuard}
import java.util.concurrent.CompletableFuture
import scala.collection.Map
diff --git a/core/src/main/scala/kafka/server/ReplicaManager.scala
b/core/src/main/scala/kafka/server/ReplicaManager.scala
index 1b3566ea3da..3e3380601fe 100644
--- a/core/src/main/scala/kafka/server/ReplicaManager.scala
+++ b/core/src/main/scala/kafka/server/ReplicaManager.scala
@@ -17,7 +17,7 @@
package kafka.server
import com.yammer.metrics.core.Meter
-import kafka.cluster.{Partition}
+import kafka.cluster.Partition
import kafka.log.LogManager
import kafka.server.HostedPartition.Online
import kafka.server.QuotaFactory.QuotaManagers
@@ -56,6 +56,7 @@ import org.apache.kafka.server.config.ReplicationConfigs
import org.apache.kafka.server.log.remote.storage.RemoteLogManager
import org.apache.kafka.server.metrics.KafkaMetricsGroup
import org.apache.kafka.server.network.BrokerEndPoint
+import org.apache.kafka.server.partition.PartitionListener
import org.apache.kafka.server.purgatory.{DelayedDeleteRecords,
DelayedOperationPurgatory, DelayedRemoteFetch, DelayedRemoteListOffsets,
DeleteRecordsPartitionStatus, ListOffsetsPartitionStatus,
TopicPartitionOperationKey}
import org.apache.kafka.server.share.fetch.{DelayedShareFetchKey,
DelayedShareFetchPartitionKey}
import org.apache.kafka.server.storage.log.{FetchParams, FetchPartitionData}
@@ -65,7 +66,7 @@ import org.apache.kafka.server.util.timer.{SystemTimer,
TimerTask}
import org.apache.kafka.server.util.{Scheduler, ShutdownableThread}
import org.apache.kafka.server.{ActionQueue, DelayedActionQueue, common}
import org.apache.kafka.storage.internals.checkpoint.{LazyOffsetCheckpoints,
OffsetCheckpointFile, OffsetCheckpoints}
-import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchDataInfo,
FetchPartitionStatus, LeaderHwChange, LogAppendInfo, LogConfig,
LogDirFailureChannel, LogOffsetMetadata, LogReadInfo, LogReadResult,
OffsetResultHolder, RecordValidationException, RemoteLogReadResult,
RemoteStorageFetchInfo, UnifiedLog, VerificationGuard,PartitionListener}
+import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchDataInfo,
FetchPartitionStatus, LeaderHwChange, LogAppendInfo, LogConfig,
LogDirFailureChannel, LogOffsetMetadata, LogReadInfo, LogReadResult,
OffsetResultHolder, RecordValidationException, RemoteLogReadResult,
RemoteStorageFetchInfo, UnifiedLog, VerificationGuard}
import org.apache.kafka.storage.log.metrics.BrokerTopicStats
import java.io.File
diff --git a/core/src/test/scala/unit/kafka/cluster/AbstractPartitionTest.scala
b/core/src/test/scala/unit/kafka/cluster/AbstractPartitionTest.scala
index 1cec468dbb2..6c8e3aafac7 100644
--- a/core/src/test/scala/unit/kafka/cluster/AbstractPartitionTest.scala
+++ b/core/src/test/scala/unit/kafka/cluster/AbstractPartitionTest.scala
@@ -25,9 +25,10 @@ import org.apache.kafka.common.utils.Utils
import org.apache.kafka.metadata.{LeaderRecoveryState, MetadataCache,
MockConfigRepository, PartitionRegistration}
import org.apache.kafka.server.common.MetadataVersion
import org.apache.kafka.server.config.ReplicationConfigs
+import org.apache.kafka.server.partition.AlterPartitionListener
import org.apache.kafka.server.util.MockTime
import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpoints
-import org.apache.kafka.storage.internals.log.{CleanerConfig,
LogConfig,AlterPartitionListener}
+import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig}
import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue}
import org.junit.jupiter.api.{AfterEach, BeforeEach}
import org.mockito.ArgumentMatchers
diff --git a/core/src/test/scala/unit/kafka/cluster/AssignmentStateTest.scala
b/core/src/test/scala/unit/kafka/cluster/AssignmentStateTest.scala
index 1177cbcc3fe..c413ae55244 100644
--- a/core/src/test/scala/unit/kafka/cluster/AssignmentStateTest.scala
+++ b/core/src/test/scala/unit/kafka/cluster/AssignmentStateTest.scala
@@ -16,9 +16,9 @@
*/
package kafka.cluster
-import org.apache.kafka.storage.internals.log.SimpleAssignmentState
import org.apache.kafka.common.DirectoryId
import org.apache.kafka.metadata.{LeaderRecoveryState, PartitionRegistration}
+import org.apache.kafka.server.partition.SimpleAssignmentState
import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse, assertTrue}
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.{Arguments, MethodSource}
diff --git a/core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala
b/core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala
index bd188363102..c82371eff45 100644
--- a/core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala
+++ b/core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala
@@ -33,11 +33,12 @@ import
org.apache.kafka.coordinator.transaction.TransactionLogConfig
import org.apache.kafka.metadata.{LeaderAndIsr, LeaderRecoveryState,
MetadataCache, MockConfigRepository, PartitionRegistration}
import org.apache.kafka.server.common.{RequestLocal, TopicIdPartition}
import org.apache.kafka.server.config.ReplicationConfigs
+import org.apache.kafka.server.partition.{AlterPartitionListener,
CommittedPartitionState, PendingShrinkIsr}
import org.apache.kafka.server.storage.log.{FetchIsolation, FetchParams}
import org.apache.kafka.server.util.MockTime
import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpoints
import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache
-import org.apache.kafka.storage.internals.log.{AlterPartitionListener,
AppendOrigin, CleanerConfig, CommittedPartitionState, LocalLog, LogAppendInfo,
LogConfig, LogDirFailureChannel, LogLoader, LogOffsetsListener, LogSegments,
PendingShrinkIsr, ProducerStateManager, ProducerStateManagerConfig, UnifiedLog,
VerificationGuard}
+import org.apache.kafka.storage.internals.log.{AppendOrigin, CleanerConfig,
LocalLog, LogAppendInfo, LogConfig, LogDirFailureChannel, LogLoader,
LogOffsetsListener, LogSegments, ProducerStateManager,
ProducerStateManagerConfig, UnifiedLog, VerificationGuard}
import org.apache.kafka.storage.log.metrics.BrokerTopicStats
import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse, assertTrue}
import org.junit.jupiter.api.{AfterEach, BeforeEach, Test}
diff --git a/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala
b/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala
index 6929b8abc2f..b13744b2d0e 100644
--- a/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala
+++ b/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala
@@ -55,13 +55,14 @@ import
org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
import org.apache.kafka.coordinator.transaction.TransactionLogConfig
import org.apache.kafka.server.common.{ControllerRequestCompletionHandler,
NodeToControllerChannelManager, RequestLocal}
import org.apache.kafka.server.metrics.KafkaYammerMetrics
+import org.apache.kafka.server.partition.{AlterPartitionListener,
OngoingReassignmentState, PartitionListener, PendingShrinkIsr,
SimpleAssignmentState}
import org.apache.kafka.server.purgatory.{DelayedDeleteRecords,
DelayedOperationPurgatory, TopicPartitionOperationKey}
import org.apache.kafka.server.share.fetch.DelayedShareFetchPartitionKey
import org.apache.kafka.server.storage.log.{FetchIsolation, FetchParams,
UnexpectedAppendOffsetException}
import org.apache.kafka.server.util.{KafkaScheduler, MockTime}
import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpoints
import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache
-import org.apache.kafka.storage.internals.log.{AlterPartitionListener,
AppendOrigin, CleanerConfig, EpochEntry, LocalLog, LogAppendInfo, LogConfig,
LogDirFailureChannel, LogLoader, LogOffsetMetadata, LogOffsetsListener,
LogReadInfo, LogSegments, LogStartOffsetIncrementReason,
OngoingReassignmentState, PartitionListener, PendingShrinkIsr,
ProducerStateManager, ProducerStateManagerConfig, SimpleAssignmentState,
UnifiedLog, VerificationGuard}
+import org.apache.kafka.storage.internals.log.{AppendOrigin, CleanerConfig,
EpochEntry, LocalLog, LogAppendInfo, LogConfig, LogDirFailureChannel,
LogLoader, LogOffsetMetadata, LogOffsetsListener, LogReadInfo, LogSegments,
LogStartOffsetIncrementReason, ProducerStateManager,
ProducerStateManagerConfig, UnifiedLog, VerificationGuard}
import org.apache.kafka.storage.log.metrics.BrokerTopicStats
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.ValueSource
diff --git
a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/PartitionMakeFollowerBenchmark.java
b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/PartitionMakeFollowerBenchmark.java
index 4d6bdce0d71..b246458893a 100644
---
a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/PartitionMakeFollowerBenchmark.java
+++
b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/PartitionMakeFollowerBenchmark.java
@@ -35,9 +35,9 @@ import org.apache.kafka.metadata.LeaderRecoveryState;
import org.apache.kafka.metadata.MetadataCache;
import org.apache.kafka.metadata.MockConfigRepository;
import org.apache.kafka.metadata.PartitionRegistration;
+import org.apache.kafka.server.partition.AlterPartitionListener;
import org.apache.kafka.server.util.KafkaScheduler;
import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpoints;
-import org.apache.kafka.storage.internals.log.AlterPartitionListener;
import org.apache.kafka.storage.internals.log.CleanerConfig;
import org.apache.kafka.storage.internals.log.LogConfig;
import org.apache.kafka.storage.internals.log.LogDirFailureChannel;
diff --git
a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/UpdateFollowerFetchStateBenchmark.java
b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/UpdateFollowerFetchStateBenchmark.java
index e222c8334b1..dc28c003966 100644
---
a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/UpdateFollowerFetchStateBenchmark.java
+++
b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/partition/UpdateFollowerFetchStateBenchmark.java
@@ -31,10 +31,10 @@ import org.apache.kafka.metadata.LeaderRecoveryState;
import org.apache.kafka.metadata.MetadataCache;
import org.apache.kafka.metadata.MockConfigRepository;
import org.apache.kafka.metadata.PartitionRegistration;
+import org.apache.kafka.server.partition.AlterPartitionListener;
import org.apache.kafka.server.replica.Replica;
import org.apache.kafka.server.util.KafkaScheduler;
import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpoints;
-import org.apache.kafka.storage.internals.log.AlterPartitionListener;
import org.apache.kafka.storage.internals.log.CleanerConfig;
import org.apache.kafka.storage.internals.log.LogConfig;
import org.apache.kafka.storage.internals.log.LogDirFailureChannel;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/AlterPartitionListener.java
b/server/src/main/java/org/apache/kafka/server/partition/AlterPartitionListener.java
similarity index 96%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/AlterPartitionListener.java
rename to
server/src/main/java/org/apache/kafka/server/partition/AlterPartitionListener.java
index 0d7449f8206..6cfdddb064e 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/AlterPartitionListener.java
+++
b/server/src/main/java/org/apache/kafka/server/partition/AlterPartitionListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
/**
* A listener that is invoked when the ISR of a partition is altered.
Implementations of this
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/AssignmentState.java
b/server/src/main/java/org/apache/kafka/server/partition/AssignmentState.java
similarity index 97%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/AssignmentState.java
rename to
server/src/main/java/org/apache/kafka/server/partition/AssignmentState.java
index b7f17e2c826..d7c22da825e 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/AssignmentState.java
+++
b/server/src/main/java/org/apache/kafka/server/partition/AssignmentState.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
import java.util.List;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/CommittedPartitionState.java
b/server/src/main/java/org/apache/kafka/server/partition/CommittedPartitionState.java
similarity index 96%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/CommittedPartitionState.java
rename to
server/src/main/java/org/apache/kafka/server/partition/CommittedPartitionState.java
index cb9a605a9da..d90131e0c6c 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/CommittedPartitionState.java
+++
b/server/src/main/java/org/apache/kafka/server/partition/CommittedPartitionState.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
import org.apache.kafka.metadata.LeaderRecoveryState;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/OngoingReassignmentState.java
b/server/src/main/java/org/apache/kafka/server/partition/OngoingReassignmentState.java
similarity index 97%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/OngoingReassignmentState.java
rename to
server/src/main/java/org/apache/kafka/server/partition/OngoingReassignmentState.java
index ca3e3ec4dcb..a5ea8607cd1 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/OngoingReassignmentState.java
+++
b/server/src/main/java/org/apache/kafka/server/partition/OngoingReassignmentState.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
import java.util.List;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PartitionListener.java
b/server/src/main/java/org/apache/kafka/server/partition/PartitionListener.java
similarity index 98%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/PartitionListener.java
rename to
server/src/main/java/org/apache/kafka/server/partition/PartitionListener.java
index bfed764570f..847cfb35ca2 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PartitionListener.java
+++
b/server/src/main/java/org/apache/kafka/server/partition/PartitionListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
import org.apache.kafka.common.TopicPartition;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PartitionState.java
b/server/src/main/java/org/apache/kafka/server/partition/PartitionState.java
similarity index 97%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/PartitionState.java
rename to
server/src/main/java/org/apache/kafka/server/partition/PartitionState.java
index 74b02695f19..ff109c3eaa3 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PartitionState.java
+++ b/server/src/main/java/org/apache/kafka/server/partition/PartitionState.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
import org.apache.kafka.metadata.LeaderRecoveryState;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PendingExpandIsr.java
b/server/src/main/java/org/apache/kafka/server/partition/PendingExpandIsr.java
similarity index 98%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/PendingExpandIsr.java
rename to
server/src/main/java/org/apache/kafka/server/partition/PendingExpandIsr.java
index e53f9b2c86a..b29e2152fb5 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PendingExpandIsr.java
+++
b/server/src/main/java/org/apache/kafka/server/partition/PendingExpandIsr.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
import org.apache.kafka.metadata.LeaderAndIsr;
import org.apache.kafka.metadata.LeaderRecoveryState;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PendingPartitionChange.java
b/server/src/main/java/org/apache/kafka/server/partition/PendingPartitionChange.java
similarity index 96%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/PendingPartitionChange.java
rename to
server/src/main/java/org/apache/kafka/server/partition/PendingPartitionChange.java
index 41eba4bfdf2..b56a3dfff2d 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PendingPartitionChange.java
+++
b/server/src/main/java/org/apache/kafka/server/partition/PendingPartitionChange.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
import org.apache.kafka.metadata.LeaderAndIsr;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PendingShrinkIsr.java
b/server/src/main/java/org/apache/kafka/server/partition/PendingShrinkIsr.java
similarity index 97%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/PendingShrinkIsr.java
rename to
server/src/main/java/org/apache/kafka/server/partition/PendingShrinkIsr.java
index 67ffcaa7549..482acaed343 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/PendingShrinkIsr.java
+++
b/server/src/main/java/org/apache/kafka/server/partition/PendingShrinkIsr.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
import org.apache.kafka.metadata.LeaderAndIsr;
import org.apache.kafka.metadata.LeaderRecoveryState;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/SimpleAssignmentState.java
b/server/src/main/java/org/apache/kafka/server/partition/SimpleAssignmentState.java
similarity index 96%
rename from
storage/src/main/java/org/apache/kafka/storage/internals/log/SimpleAssignmentState.java
rename to
server/src/main/java/org/apache/kafka/server/partition/SimpleAssignmentState.java
index 186e6c689b3..901d3e21e52 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/SimpleAssignmentState.java
+++
b/server/src/main/java/org/apache/kafka/server/partition/SimpleAssignmentState.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.storage.internals.log;
+package org.apache.kafka.server.partition;
import java.util.List;
