Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MINOR: Cleanup ControllerContext and StateChangeLogger #18588

Merged
merged 1 commit into from
Jan 22, 2025
Merged

MINOR: Cleanup ControllerContext and StateChangeLogger #18588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions core/src/main/scala/kafka/controller/ControllerContext.scala
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions core/src/main/scala/kafka/controller/StateChangeLogger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,4 @@ class StateChangeLogger(brokerId: Int, inControllerContext: Boolean, controllerE
logIdent = s"[$prefix id=$brokerId$epochEntry] "
}

def withControllerEpoch(controllerEpoch: Int): StateChangeLogger =
new StateChangeLogger(brokerId, inControllerContext, Some(controllerEpoch))

def messageWithPrefix(message: String): String = msgWithLogIdent(message)

}
20 changes: 10 additions & 10 deletions core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package kafka.admin

import java.util.Collections
import kafka.controller.ReplicaAssignment
import kafka.server.{BaseRequestTest, BrokerServer}
import kafka.utils.TestUtils
import kafka.utils.TestUtils._
Expand All @@ -43,25 +42,26 @@ class AddPartitionsTest extends BaseRequestTest {
val partitionId = 0

val topic1 = "new-topic1"
val topic1Assignment = Map(0 -> ReplicaAssignment(Seq(0,1), List(), List()))
val topic1Assignment = Map(0 -> Seq(0,1))
val topic2 = "new-topic2"
val topic2Assignment = Map(0 -> ReplicaAssignment(Seq(1,2), List(), List()))
val topic2Assignment = Map(0 -> Seq(1,2))
val topic3 = "new-topic3"
val topic3Assignment = Map(0 -> ReplicaAssignment(Seq(2,3,0,1), List(), List()))
val topic3Assignment = Map(0 -> Seq(2,3,0,1))
val topic4 = "new-topic4"
val topic4Assignment = Map(0 -> ReplicaAssignment(Seq(0,3), List(), List()))
val topic4Assignment = Map(0 -> Seq(0,3))
val topic5 = "new-topic5"
val topic5Assignment = Map(1 -> ReplicaAssignment(Seq(0,1), List(), List()))
val topic5Assignment = Map(1 -> Seq(0,1))
var admin: Admin = _


@BeforeEach
override def setUp(testInfo: TestInfo): Unit = {
super.setUp(testInfo)
brokers.foreach(broker => broker.asInstanceOf[BrokerServer].lifecycleManager.initialUnfenceFuture.get())
createTopicWithAssignment(topic1, partitionReplicaAssignment = topic1Assignment.map { case (k, v) => k -> v.replicas })
createTopicWithAssignment(topic2, partitionReplicaAssignment = topic2Assignment.map { case (k, v) => k -> v.replicas })
createTopicWithAssignment(topic3, partitionReplicaAssignment = topic3Assignment.map { case (k, v) => k -> v.replicas })
createTopicWithAssignment(topic4, partitionReplicaAssignment = topic4Assignment.map { case (k, v) => k -> v.replicas })
createTopicWithAssignment(topic1, partitionReplicaAssignment = topic1Assignment)
createTopicWithAssignment(topic2, partitionReplicaAssignment = topic2Assignment)
createTopicWithAssignment(topic3, partitionReplicaAssignment = topic3Assignment)
createTopicWithAssignment(topic4, partitionReplicaAssignment = topic4Assignment)
admin = createAdminClient()
}

Expand Down
Loading