showuon commented on code in PR #16602:
URL: https://github.com/apache/kafka/pull/16602#discussion_r1749654966
##########
storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectListOffsetsAction.java:
##########
@@ -19,33 +19,50 @@
import org.apache.kafka.clients.admin.ListOffsetsResult;
import org.apache.kafka.clients.admin.OffsetSpec;
import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache;
import org.apache.kafka.storage.internals.log.EpochEntry;
import org.apache.kafka.tiered.storage.TieredStorageTestAction;
import org.apache.kafka.tiered.storage.TieredStorageTestContext;
import java.io.PrintStream;
import java.util.Collections;
+import java.util.Optional;
import java.util.concurrent.ExecutionException;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public final class ExpectListOffsetsAction implements TieredStorageTestAction {
+ private final int brokerId;
private final TopicPartition partition;
private final OffsetSpec spec;
- private final EpochEntry expected;
+ private EpochEntry expected;
- public ExpectListOffsetsAction(TopicPartition partition,
+ public ExpectListOffsetsAction(int brokerId,
+ TopicPartition partition,
OffsetSpec spec,
EpochEntry expected) {
+ this.brokerId = brokerId;
this.partition = partition;
this.spec = spec;
this.expected = expected;
}
@Override
public void doExecute(TieredStorageTestContext context) throws
InterruptedException, ExecutionException {
+ if (expected.epoch == Integer.MAX_VALUE) {
+ // The leaderEpoch for the partition gets bumped/incremented when
the partition gets reassigned (or)
+ // a new leader gets elected. But, the leaderEpoch value is
non-deterministic between the ZK and Kraft mode.
+ // So, reading the leader-epoch value from the broker's
LeaderEpochFileCache for the given offset.
+ Optional<LeaderEpochFileCache> leaderEpochFileCache =
context.leaderEpochFileCache(brokerId, partition);
+ assertTrue(leaderEpochFileCache.isPresent());
+
leaderEpochFileCache.get().epochForOffset(expected.startOffset).ifPresent(epoch
->
+ expected = new EpochEntry(epoch, expected.startOffset)
Review Comment:
Could you explain more why the leaderEpoch is non-deterministic? This works
though, it makes the testSpec is not readable when verifying listOffset.
##########
storage/src/test/java/org/apache/kafka/tiered/storage/integration/ListOffsetsTest.java:
##########
@@ -0,0 +1,111 @@
+/*
+ * 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.tiered.storage.integration;
+
+import org.apache.kafka.clients.admin.OffsetSpec;
+import org.apache.kafka.common.utils.MockTime;
+import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.storage.internals.log.EpochEntry;
+import org.apache.kafka.tiered.storage.TieredStorageTestBuilder;
+import org.apache.kafka.tiered.storage.TieredStorageTestHarness;
+import org.apache.kafka.tiered.storage.specs.KeyValueSpec;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.kafka.common.utils.Utils.mkEntry;
+import static org.apache.kafka.common.utils.Utils.mkMap;
+import static
org.apache.kafka.server.log.remote.storage.LocalTieredStorageEvent.EventType.DELETE_SEGMENT;
+
+public class ListOffsetsTest extends TieredStorageTestHarness {
+ @Override
+ public int brokerCount() {
+ return 2;
+ }
+
+ @Override
+ protected void writeTestSpecifications(TieredStorageTestBuilder builder) {
+ final int broker0 = 0;
+ final int broker1 = 1;
+ final String topicA = "topicA";
+ final int p0 = 0;
+ final Time time = new MockTime();
+ final long timestamp = time.milliseconds();
+ final Map<Integer, List<Integer>> assignment = mkMap(mkEntry(p0,
Arrays.asList(broker0, broker1)));
+
+ builder
+ .createTopic(topicA, 1, 2, 2, assignment, true)
+ // send records to partition 0 and expect the first segment to
be offloaded
+ .expectEarliestLocalOffsetInLogDirectory(topicA, p0, 2L)
+ .expectSegmentToBeOffloaded(broker0, topicA, p0, 0,
+ new KeyValueSpec("k1", "v1", timestamp),
+ new KeyValueSpec("k2", "v2", timestamp + 1))
+ .produceWithTimestamp(topicA, p0,
+ new KeyValueSpec("k1", "v1", timestamp),
+ new KeyValueSpec("k2", "v2", timestamp + 1),
+ new KeyValueSpec("k3", "v3", timestamp + 2))
+
+ // switch leader and send more records to partition 0 and
expect the second segment to be offloaded.
+ // On reassignment, leader-epoch gets bumped from 0 -> 1 -> 2
+ .reassignReplica(topicA, p0, Arrays.asList(broker1, broker0))
+ // On leader election, leader-epoch gets bumped from 2 -> 3
Review Comment:
These 2 comments didn't reflect in the below assertion.
##########
storage/src/test/java/org/apache/kafka/tiered/storage/integration/ListOffsetsTest.java:
##########
@@ -0,0 +1,111 @@
+/*
+ * 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.tiered.storage.integration;
+
+import org.apache.kafka.clients.admin.OffsetSpec;
+import org.apache.kafka.common.utils.MockTime;
+import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.storage.internals.log.EpochEntry;
+import org.apache.kafka.tiered.storage.TieredStorageTestBuilder;
+import org.apache.kafka.tiered.storage.TieredStorageTestHarness;
+import org.apache.kafka.tiered.storage.specs.KeyValueSpec;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.kafka.common.utils.Utils.mkEntry;
+import static org.apache.kafka.common.utils.Utils.mkMap;
+import static
org.apache.kafka.server.log.remote.storage.LocalTieredStorageEvent.EventType.DELETE_SEGMENT;
+
+public class ListOffsetsTest extends TieredStorageTestHarness {
+ @Override
+ public int brokerCount() {
+ return 2;
+ }
+
+ @Override
+ protected void writeTestSpecifications(TieredStorageTestBuilder builder) {
+ final int broker0 = 0;
+ final int broker1 = 1;
+ final String topicA = "topicA";
+ final int p0 = 0;
+ final Time time = new MockTime();
+ final long timestamp = time.milliseconds();
+ final Map<Integer, List<Integer>> assignment = mkMap(mkEntry(p0,
Arrays.asList(broker0, broker1)));
+
+ builder
+ .createTopic(topicA, 1, 2, 2, assignment, true)
+ // send records to partition 0 and expect the first segment to
be offloaded
+ .expectEarliestLocalOffsetInLogDirectory(topicA, p0, 2L)
+ .expectSegmentToBeOffloaded(broker0, topicA, p0, 0,
+ new KeyValueSpec("k1", "v1", timestamp),
+ new KeyValueSpec("k2", "v2", timestamp + 1))
+ .produceWithTimestamp(topicA, p0,
+ new KeyValueSpec("k1", "v1", timestamp),
+ new KeyValueSpec("k2", "v2", timestamp + 1),
+ new KeyValueSpec("k3", "v3", timestamp + 2))
+
+ // switch leader and send more records to partition 0 and
expect the second segment to be offloaded.
+ // On reassignment, leader-epoch gets bumped from 0 -> 1 -> 2
+ .reassignReplica(topicA, p0, Arrays.asList(broker1, broker0))
+ // On leader election, leader-epoch gets bumped from 2 -> 3
+ .expectLeader(topicA, p0, broker1, true)
+ .expectEarliestLocalOffsetInLogDirectory(topicA, p0, 4L)
+
+ // NOTE that the (k3, v3) message was sent in the previous
producer so we cannot expect that event in
+ // the segment to be offloaded. We can only expect the new
messages.
+ .expectSegmentToBeOffloaded(broker1, topicA, p0, 2,
+ new KeyValueSpec("k4", "v4", timestamp + 3))
+ .produceWithTimestamp(topicA, p0,
+ new KeyValueSpec("k4", "v4", timestamp + 3),
+ new KeyValueSpec("k5", "v5", timestamp + 4),
+ new KeyValueSpec("k6", "v6", timestamp + 5))
+
+ // LIST_OFFSETS requests can list the offset from any node.
+ // List offset for special timestamps
+ .expectListOffsets(broker1, topicA, p0, OffsetSpec.earliest(),
new EpochEntry(0, 0))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.earliestLocal(), new EpochEntry(Integer.MAX_VALUE, 4))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.latestTiered(), new EpochEntry(Integer.MAX_VALUE, 3))
+ .expectListOffsets(broker1, topicA, p0, OffsetSpec.latest(),
new EpochEntry(Integer.MAX_VALUE, 6))
+
+ // fetch offset using timestamp from the local disk
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.forTimestamp(timestamp + 6), new EpochEntry(-1, -1))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.forTimestamp(timestamp + 5), new EpochEntry(Integer.MAX_VALUE, 5))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.forTimestamp(timestamp + 4), new EpochEntry(Integer.MAX_VALUE, 4))
+
+ // fetch offset using timestamp from the remote disk
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.forTimestamp(timestamp - 1), new EpochEntry(0, 0))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.forTimestamp(timestamp), new EpochEntry(0, 0))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.forTimestamp(timestamp + 1), new EpochEntry(0, 1))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.forTimestamp(timestamp + 3), new EpochEntry(Integer.MAX_VALUE, 3))
+
+ // delete some records and check whether the earliest_offset
gets updated.
+ .expectDeletionInRemoteStorage(broker1, topicA, p0,
DELETE_SEGMENT, 1)
+ .deleteRecords(topicA, p0, 3L)
+ .expectListOffsets(broker1, topicA, p0, OffsetSpec.earliest(),
new EpochEntry(Integer.MAX_VALUE, 3))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.earliestLocal(), new EpochEntry(Integer.MAX_VALUE, 4))
+
+ // delete all the records in remote layer and expect that
earliest and earliest_local offsets are same
+ .expectDeletionInRemoteStorage(broker1, topicA, p0,
DELETE_SEGMENT, 1)
+ .deleteRecords(topicA, p0, 4L)
+ .expectListOffsets(broker1, topicA, p0, OffsetSpec.earliest(),
new EpochEntry(Integer.MAX_VALUE, 4))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.earliestLocal(), new EpochEntry(Integer.MAX_VALUE, 4))
+ .expectListOffsets(broker1, topicA, p0,
OffsetSpec.latestTiered(), new EpochEntry(-1, 3))
Review Comment:
nit: Let's use `RecordBatch.NO_PARTITION_LEADER_EPOCH` instead of `-1`.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
