chia7712 commented on code in PR #20110: URL: https://github.com/apache/kafka/pull/20110#discussion_r2191189104
########## storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java: ########## @@ -0,0 +1,222 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.kafka.storage.internals.log; + +import org.apache.kafka.common.compress.Compression; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.SimpleRecord; +import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.coordinator.transaction.TransactionLogConfig; +import org.apache.kafka.server.storage.log.FetchIsolation; +import org.apache.kafka.server.util.KafkaScheduler; +import org.apache.kafka.storage.log.metrics.BrokerTopicStats; +import org.apache.kafka.test.TestUtils; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.stream.IntStream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + + +public class LogConcurrencyTest { + private final BrokerTopicStats brokerTopicStats = new BrokerTopicStats(); + private final KafkaScheduler scheduler = new KafkaScheduler(1); + private final File tmpDir = TestUtils.tempDirectory(); + private final File logDir = TestUtils.randomPartitionLogDir(tmpDir); + private UnifiedLog log; + + @BeforeEach + public void setup() { + scheduler.startup(); + } + + @AfterEach + public void teardown() throws Exception { + scheduler.shutdown(); + if (log != null) { + log.close(); + } + Utils.delete(tmpDir); + } + + @Test + public void testUncommittedDataNotConsumed() throws Exception { + testUncommittedDataNotConsumed(createLog()); Review Comment: Does the log get closed? ########## storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java: ########## @@ -0,0 +1,222 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.kafka.storage.internals.log; + +import org.apache.kafka.common.compress.Compression; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.SimpleRecord; +import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.coordinator.transaction.TransactionLogConfig; +import org.apache.kafka.server.storage.log.FetchIsolation; +import org.apache.kafka.server.util.KafkaScheduler; +import org.apache.kafka.storage.log.metrics.BrokerTopicStats; +import org.apache.kafka.test.TestUtils; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.stream.IntStream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + + +public class LogConcurrencyTest { + private final BrokerTopicStats brokerTopicStats = new BrokerTopicStats(); + private final KafkaScheduler scheduler = new KafkaScheduler(1); + private final File tmpDir = TestUtils.tempDirectory(); + private final File logDir = TestUtils.randomPartitionLogDir(tmpDir); + private UnifiedLog log; + + @BeforeEach + public void setup() { + scheduler.startup(); + } + + @AfterEach + public void teardown() throws Exception { + scheduler.shutdown(); + if (log != null) { + log.close(); + } + Utils.delete(tmpDir); + } + + @Test + public void testUncommittedDataNotConsumed() throws Exception { + testUncommittedDataNotConsumed(createLog()); + } + + @Test + public void testUncommittedDataNotConsumedFrequentSegmentRolls() throws Exception { + final Properties logProps = new Properties(); + logProps.put(LogConfig.INTERNAL_SEGMENT_BYTES_CONFIG, 237); + final LogConfig logConfig = new LogConfig(logProps); + testUncommittedDataNotConsumed(createLog(logConfig)); + } + + private void testUncommittedDataNotConsumed(UnifiedLog log) throws Exception { Review Comment: Could you please try to use `CompletableFuture`? ```java private void testUncommittedDataNotConsumed(UnifiedLog log) { var maxOffset = 5000; var consumerFuture = CompletableFuture.supplyAsync(consumerTask(log, maxOffset)); var fetcherTaskFuture = CompletableFuture.runAsync(logAppendTask(log, maxOffset)); fetcherTaskFuture.join(); validateConsumedData(log, consumerFuture.join()); } private Supplier<List<FetchedBatch>> consumerTask(UnifiedLog log, int lastOffset) { return () -> assertDoesNotThrow(() -> { final List<FetchedBatch> consumedBatches = new ArrayList<>(); // Now a local variable long fetchOffset = 0L; while (log.highWatermark() < lastOffset) { final FetchDataInfo readInfo = log.read(fetchOffset, 1, FetchIsolation.HIGH_WATERMARK, true); for (RecordBatch batch : readInfo.records.batches()) { consumedBatches.add(new FetchedBatch(batch.baseOffset(), batch.partitionLeaderEpoch())); fetchOffset = batch.lastOffset() + 1; } } return consumedBatches; }); } private Runnable logAppendTask(UnifiedLog log, int lastOffset) { return () -> assertDoesNotThrow(() -> { int leaderEpoch = 1; boolean isLeader = true; while (log.highWatermark() < lastOffset) { switch (TestUtils.RANDOM.nextInt(2)) { case 0 -> { final LogOffsetMetadata logEndOffsetMetadata = log.logEndOffsetMetadata(); final long logEndOffset = logEndOffsetMetadata.messageOffset; final int batchSize = TestUtils.RANDOM.nextInt(9) + 1; final SimpleRecord[] records = IntStream.rangeClosed(0, batchSize) .mapToObj(i -> new SimpleRecord(String.valueOf(i).getBytes())) .toArray(SimpleRecord[]::new); if (isLeader) { log.appendAsLeader(MemoryRecords.withRecords(Compression.NONE, records), leaderEpoch); log.maybeIncrementHighWatermark(logEndOffsetMetadata); } else { log.appendAsFollower( MemoryRecords.withRecords( logEndOffset, Compression.NONE, leaderEpoch, records ), Integer.MAX_VALUE ); log.updateHighWatermark(logEndOffset); } } case 1 -> { isLeader = !isLeader; leaderEpoch += 1; if (!isLeader) { log.truncateTo(log.highWatermark()); } } } } }); } ``` -- 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
