You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by cm...@apache.org on 2024/03/22 20:19:27 UTC
(kafka) 01/01: MINOR: ensure LocalLogManagerTestEnv is closed in QuorumControllerTest
This is an automated email from the ASF dual-hosted git repository.
cmccabe pushed a commit to branch cmccabe_2024_03_22_fix_closeables
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit bf79133bf02c7e6425ac8ea61cf3f13a7d3e39ca
Author: Colin P. McCabe <cm...@apache.org>
AuthorDate: Fri Mar 22 13:18:59 2024 -0700
MINOR: ensure LocalLogManagerTestEnv is closed in QuorumControllerTest
---
.../kafka/controller/QuorumControllerTest.java | 37 ++++++++++------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
index bcdb3ed7919..462cd726857 100644
--- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
+++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
@@ -1540,15 +1540,14 @@ public class QuorumControllerTest {
@Test
public void testMigrationsEnabledForOldBootstrapMetadataVersion() throws Exception {
try (
- LocalLogManagerTestEnv logEnv = new LocalLogManagerTestEnv.Builder(1).build()
+ LocalLogManagerTestEnv logEnv = new LocalLogManagerTestEnv.Builder(1).build();
+ QuorumControllerTestEnv controlEnv = new QuorumControllerTestEnv.Builder(logEnv).
+ setControllerBuilderInitializer(controllerBuilder -> {
+ controllerBuilder.setZkMigrationEnabled(true);
+ }).
+ setBootstrapMetadata(BootstrapMetadata.fromVersion(MetadataVersion.IBP_3_3_IV0, "test")).
+ build();
) {
- QuorumControllerTestEnv.Builder controlEnvBuilder = new QuorumControllerTestEnv.Builder(logEnv).
- setControllerBuilderInitializer(controllerBuilder -> {
- controllerBuilder.setZkMigrationEnabled(true);
- }).
- setBootstrapMetadata(BootstrapMetadata.fromVersion(MetadataVersion.IBP_3_3_IV0, "test"));
-
- QuorumControllerTestEnv controlEnv = controlEnvBuilder.build();
QuorumController active = controlEnv.activeController();
assertEquals(ZkMigrationState.NONE, active.appendReadEvent("read migration state", OptionalLong.empty(),
() -> active.featureControl().zkMigrationState()).get(30, TimeUnit.SECONDS));
@@ -1658,12 +1657,12 @@ public class QuorumControllerTest {
@Test
public void testFailoverDuringMigrationTransaction() throws Exception {
try (
- LocalLogManagerTestEnv logEnv = new LocalLogManagerTestEnv.Builder(3).build()
- ) {
- QuorumControllerTestEnv.Builder controlEnvBuilder = new QuorumControllerTestEnv.Builder(logEnv).
+ LocalLogManagerTestEnv logEnv = new LocalLogManagerTestEnv.Builder(3).build();
+ QuorumControllerTestEnv controlEnv = new QuorumControllerTestEnv.Builder(logEnv).
setControllerBuilderInitializer(controllerBuilder -> controllerBuilder.setZkMigrationEnabled(true)).
- setBootstrapMetadata(BootstrapMetadata.fromVersion(MetadataVersion.IBP_3_6_IV1, "test"));
- QuorumControllerTestEnv controlEnv = controlEnvBuilder.build();
+ setBootstrapMetadata(BootstrapMetadata.fromVersion(MetadataVersion.IBP_3_6_IV1, "test")).
+ build();
+ ) {
QuorumController active = controlEnv.activeController(true);
ZkRecordConsumer migrationConsumer = active.zkRecordConsumer();
migrationConsumer.beginMigration().get(30, TimeUnit.SECONDS);
@@ -1703,18 +1702,17 @@ public class QuorumControllerTest {
@EnumSource(value = MetadataVersion.class, names = {"IBP_3_4_IV0", "IBP_3_5_IV0", "IBP_3_6_IV0", "IBP_3_6_IV1"})
public void testBrokerHeartbeatDuringMigration(MetadataVersion metadataVersion) throws Exception {
try (
- LocalLogManagerTestEnv logEnv = new LocalLogManagerTestEnv.Builder(1).build()
- ) {
- QuorumControllerTestEnv.Builder controlEnvBuilder = new QuorumControllerTestEnv.Builder(logEnv).
+ LocalLogManagerTestEnv logEnv = new LocalLogManagerTestEnv.Builder(1).build();
+ QuorumControllerTestEnv controlEnv = new QuorumControllerTestEnv.Builder(logEnv).
setControllerBuilderInitializer(controllerBuilder ->
controllerBuilder
.setZkMigrationEnabled(true)
.setMaxIdleIntervalNs(OptionalLong.of(TimeUnit.MILLISECONDS.toNanos(100)))
).
- setBootstrapMetadata(BootstrapMetadata.fromVersion(metadataVersion, "test"));
- QuorumControllerTestEnv controlEnv = controlEnvBuilder.build();
+ setBootstrapMetadata(BootstrapMetadata.fromVersion(metadataVersion, "test")).
+ build();
+ ) {
QuorumController active = controlEnv.activeController(true);
-
// Register a ZK broker
BrokerRegistrationReply reply = active.registerBroker(ANONYMOUS_CONTEXT,
new BrokerRegistrationRequestData().
@@ -1753,7 +1751,6 @@ public class QuorumControllerTest {
active.processBrokerHeartbeat(ANONYMOUS_CONTEXT, new BrokerHeartbeatRequestData().
setWantFence(false).setBrokerEpoch(reply.epoch()).setBrokerId(0).
setCurrentMetadataOffset(100100L)).get());
-
}
}
}