Skip to content

Commit 62652a3

Browse files
committed
fix test
1 parent 99cde55 commit 62652a3

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

server-common/src/main/java/org/apache/kafka/server/common/MetadataVersion.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,9 @@ public short fetchRequestVersion() {
275275
}
276276

277277
public short listOffsetRequestVersion() {
278-
if (this.isAtLeast(IBP_4_2_IV1)) {
278+
if (this.isAtLeast(IBP_4_3_IV0)) {
279+
return 12;
280+
} else if (this.isAtLeast(IBP_4_2_IV1)) {
279281
return 11;
280282
} else if (this.isAtLeast(IBP_4_0_IV3)) {
281283
return 10;

storage/src/test/java/org/apache/kafka/server/purgatory/DelayedRemoteListOffsetsTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ public void testPartitionExpirationMeterUsesTopicPartitionKey() throws Interrupt
148148
assertEquals(statusByPartition.size(), cancelledCount.get());
149149
assertEquals(statusByPartition.size(), numResponse.get());
150150
assertEquals(initialAggregateCount + statusByPartition.size(), DelayedRemoteListOffsets.AGGREGATE_EXPIRATION_METER.count());
151-
assertEquals(2, DelayedRemoteListOffsets.PARTITION_EXPIRATION_METERS.size());
152-
assertEquals(2, DelayedRemoteListOffsets.PARTITION_EXPIRATION_METERS.get(sharedPartition).count());
153-
assertEquals(1, DelayedRemoteListOffsets.PARTITION_EXPIRATION_METERS.get(otherPartition).count());
154151
}
155152

156153
@Test
@@ -285,8 +282,9 @@ public void testPartialResponseWhenNotLeaderOrFollowerExceptionOnOnePartition()
285282
return true;
286283
});
287284

285+
var failTopicIdPartition = new TopicIdPartition(Uuid.randomUuid(), 0, "test1");
288286
doThrow(new NotLeaderOrFollowerException("Not leader or follower!"))
289-
.when(partitionOrException).accept(new TopicIdPartition(Uuid.randomUuid(), 0, "test1"));
287+
.when(partitionOrException).accept(failTopicIdPartition);
290288
AsyncOffsetReadFutureHolder<OffsetResultHolder.FileRecordsOrError> errorFutureHolder = mock(AsyncOffsetReadFutureHolder.class);
291289
CompletableFuture<OffsetResultHolder.FileRecordsOrError> errorTaskFuture = new CompletableFuture<>();
292290
when(errorFutureHolder.taskFuture()).thenAnswer(f -> errorTaskFuture);
@@ -295,7 +293,7 @@ public void testPartialResponseWhenNotLeaderOrFollowerExceptionOnOnePartition()
295293
Map<TopicIdPartition, ListOffsetsPartitionStatus> statusByPartition = Map.of(
296294
new TopicIdPartition(Uuid.randomUuid(), new TopicPartition("test", 0)), ListOffsetsPartitionStatus.builder().futureHolderOpt(Optional.of(holder)).build(),
297295
new TopicIdPartition(Uuid.randomUuid(), new TopicPartition("test", 1)), ListOffsetsPartitionStatus.builder().futureHolderOpt(Optional.of(holder)).build(),
298-
new TopicIdPartition(Uuid.randomUuid(), new TopicPartition("test1", 0)), ListOffsetsPartitionStatus.builder().futureHolderOpt(Optional.of(errorFutureHolder)).build(),
296+
failTopicIdPartition, ListOffsetsPartitionStatus.builder().futureHolderOpt(Optional.of(errorFutureHolder)).build(),
299297
new TopicIdPartition(Uuid.randomUuid(), new TopicPartition("test1", 1)), ListOffsetsPartitionStatus.builder().futureHolderOpt(Optional.of(holder)).build()
300298
);
301299

test-common/test-common-runtime/src/test/java/org/apache/kafka/common/test/junit/ClusterTestExtensionsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void testNoAutoStart() {
197197

198198
@ClusterTest
199199
public void testDefaults(ClusterInstance clusterInstance) {
200-
assertEquals(MetadataVersion.IBP_4_2_IV1, clusterInstance.config().metadataVersion());
200+
assertEquals(MetadataVersion.IBP_4_3_IV0, clusterInstance.config().metadataVersion());
201201
}
202202

203203
@ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT})

0 commit comments

Comments
 (0)