chia7712 commented on code in PR #20335:
URL: https://github.com/apache/kafka/pull/20335#discussion_r2274273267
##########
core/src/test/scala/unit/kafka/cluster/AssignmentStateTest.scala:
##########
@@ -86,31 +86,33 @@ class AssignmentStateTest extends AbstractPartitionTest {
@ParameterizedTest
@MethodSource(Array("parameters"))
- def testPartitionAssignmentStatus(isr: util.List[Integer], replicas:
util.List[Integer],
- adding: util.List[Integer], removing:
util.List[Integer],
+ def testPartitionAssignmentStatus(isr: Array[Int], replicas: Array[Int],
+ adding: Array[Int], removing: Array[Int],
original: util.List[Int],
isUnderReplicated: Boolean): Unit = {
- val leaderState = new PartitionState()
+ val partitionRegistrationBuilder = new PartitionRegistration.Builder()
.setLeader(brokerId)
+ .setLeaderRecoveryState(LeaderRecoveryState.RECOVERED)
.setLeaderEpoch(6)
.setIsr(isr)
.setPartitionEpoch(1)
.setReplicas(replicas)
- .setIsNew(false)
- if (!adding.isEmpty)
- leaderState.setAddingReplicas(adding)
- if (!removing.isEmpty)
- leaderState.setRemovingReplicas(removing)
+ .setDirectories(DirectoryId.unassignedArray(replicas.length))
+ if (adding.nonEmpty)
+ partitionRegistrationBuilder.setAddingReplicas(adding)
+ if (removing.nonEmpty)
+ partitionRegistrationBuilder.setRemovingReplicas(removing)
+ val partitionRegistration = partitionRegistrationBuilder.build()
val isReassigning = !adding.isEmpty || !removing.isEmpty
// set the original replicas as the URP calculation will need them
if (!original.isEmpty)
partition.assignmentState = SimpleAssignmentState(original.asScala)
// do the test
- partition.makeLeader(leaderState, offsetCheckpoints, None)
+ partition.makeLeader(partitionRegistration, isNew = false,
offsetCheckpoints, None)
assertEquals(isReassigning, partition.isReassigning)
- if (!adding.isEmpty)
- adding.forEach(r => assertTrue(partition.isAddingReplica(r)))
+ if (adding.nonEmpty)
Review Comment:
ditto
##########
core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala:
##########
@@ -2654,20 +2653,21 @@ class ReplicaManagerTest {
(replicaManager, mockLogMgr)
}
- private def leaderAndIsrPartitionState(topicPartition: TopicPartition,
- leaderEpoch: Int,
- leaderBrokerId: Int,
- aliveBrokerIds: Seq[Integer],
- isNew: Boolean = false):
JPartitionState = {
- new JPartitionState()
- .setTopicName(topic)
- .setPartitionIndex(topicPartition.partition)
- .setLeader(leaderBrokerId)
+ private def makePartitionRegistration(leader: Int,
Review Comment:
`makePartitionRegistration` -> `partitionRegistration`. Simpler is better
##########
core/src/test/scala/unit/kafka/cluster/AssignmentStateTest.scala:
##########
@@ -86,31 +86,33 @@ class AssignmentStateTest extends AbstractPartitionTest {
@ParameterizedTest
@MethodSource(Array("parameters"))
- def testPartitionAssignmentStatus(isr: util.List[Integer], replicas:
util.List[Integer],
- adding: util.List[Integer], removing:
util.List[Integer],
+ def testPartitionAssignmentStatus(isr: Array[Int], replicas: Array[Int],
+ adding: Array[Int], removing: Array[Int],
original: util.List[Int],
isUnderReplicated: Boolean): Unit = {
- val leaderState = new PartitionState()
+ val partitionRegistrationBuilder = new PartitionRegistration.Builder()
.setLeader(brokerId)
+ .setLeaderRecoveryState(LeaderRecoveryState.RECOVERED)
.setLeaderEpoch(6)
.setIsr(isr)
.setPartitionEpoch(1)
.setReplicas(replicas)
- .setIsNew(false)
- if (!adding.isEmpty)
- leaderState.setAddingReplicas(adding)
- if (!removing.isEmpty)
- leaderState.setRemovingReplicas(removing)
+ .setDirectories(DirectoryId.unassignedArray(replicas.length))
+ if (adding.nonEmpty)
Review Comment:
Are those `nonEmpty` checks necessary?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
