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

Jump to bottom

BUG FIX fetch empty topic metadata #1710

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −9
Open

BUG FIX fetch empty topic metadata #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c0a42f
Fix fetching metadata for empty but not new topic
Oct 6, 2024
2c5734c
Added test case
Oct 6, 2024
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
15 changes: 9 additions & 6 deletions samza-kafka/src/main/java/org/apache/samza/system/kafka/KafkaSystemAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
Expand Down Expand Up @@ -465,13 +466,15 @@ private OffsetsMaps fetchTopicPartitionsMetadata(List<TopicPartition> topicParti
// For normal case, the newest offset will correspond to the offset of the newest message in the stream;
// But for the big message, it is not the case. Seeking on the newest offset gives nothing for the newest big message.
// For now, we keep it as is for newest offsets the same as historical metadata structure.
if (offset <= 0) {
LOG.warn(
"Empty Kafka topic partition {} with upcoming offset {}. Skipping newest offset and setting oldest offset to 0 to consume from beginning",
topicPartition, offset);
oldestOffsets.put(KafkaUtil.toSystemStreamPartition(systemName, topicPartition), "0");
long beginOffset = oldestOffsetsWithLong.get(topicPartition);
if (offset <= 0L) {
LOG.warn("Empty Kafka topic partition {} with upcoming offset {}. Skipping newest offset and setting oldest offset to 0 to consume from beginning", topicPartition, offset);
oldestOffsets.put(KafkaUtil.toSystemStreamPartition(this.systemName, topicPartition), "0");
} else if (Objects.equals(beginOffset, offset)) {
LOG.warn("Empty Kafka topic partition {} with upcoming offset {}", topicPartition, offset);
newestOffsets.put(KafkaUtil.toSystemStreamPartition(this.systemName, topicPartition), String.valueOf(offset));
} else {
newestOffsets.put(KafkaUtil.toSystemStreamPartition(systemName, topicPartition), String.valueOf(offset - 1));
newestOffsets.put(KafkaUtil.toSystemStreamPartition(this.systemName, topicPartition), String.valueOf(offset - 1L));
}
});
return new OffsetsMaps(oldestOffsets, newestOffsets, upcomingOffsets);
Expand Down
15 changes: 12 additions & 3 deletions samza-kafka/src/test/java/org/apache/samza/system/kafka/TestKafkaSystemAdminWithMock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public class TestKafkaSystemAdminWithMock {
private PartitionInfo mockPartitionInfo1;
private TopicPartition testTopicPartition0;
private TopicPartition testTopicPartition1;
private TopicPartition testTopicPartition2;

private ConcurrentHashMap<String, KafkaSystemConsumer> consumersReference;

Expand Down Expand Up @@ -100,6 +101,7 @@ public void setUp() throws Exception {
// mock LinkedInKafkaConsumerImpl other behaviors
testTopicPartition0 = new TopicPartition(VALID_TOPIC, 0);
testTopicPartition1 = new TopicPartition(VALID_TOPIC, 1);
testTopicPartition2 = new TopicPartition(VALID_TOPIC, 2);
Map<TopicPartition, Long> testBeginningOffsets =
ImmutableMap.of(testTopicPartition0, KAFKA_BEGINNING_OFFSET_FOR_PARTITION0, testTopicPartition1,
KAFKA_BEGINNING_OFFSET_FOR_PARTITION1);
Expand Down Expand Up @@ -176,9 +178,9 @@ public void testGetSystemStreamMetaDataWithNoTopic() {
public void testGetSystemStreamMetaDataForTopicWithNoMessage() {
// The topic with no messages will have beginningOffset = 0 and endOffset = 0
when(mockKafkaConsumer.beginningOffsets(ImmutableList.of(testTopicPartition0, testTopicPartition1))).thenReturn(
ImmutableMap.of(testTopicPartition0, 0L, testTopicPartition1, 0L));
ImmutableMap.of(testTopicPartition0, 0L, testTopicPartition1, 0L, testTopicPartition2, 10L));
when(mockKafkaConsumer.endOffsets(ImmutableList.of(testTopicPartition0, testTopicPartition1))).thenReturn(
ImmutableMap.of(testTopicPartition0, 0L, testTopicPartition1, 0L));
ImmutableMap.of(testTopicPartition0, 0L, testTopicPartition1, 0L, testTopicPartition2, 10L));

Map<String, SystemStreamMetadata> metadataMap =
kafkaSystemAdmin.getSystemStreamMetadata(ImmutableSet.of(VALID_TOPIC));
Expand All @@ -190,7 +192,7 @@ public void testGetSystemStreamMetaDataForTopicWithNoMessage() {
// verify the offset for each partition
Map<Partition, SystemStreamMetadata.SystemStreamPartitionMetadata> systemStreamPartitionMetadata =
metadataMap.get(VALID_TOPIC).getSystemStreamPartitionMetadata();
assertEquals("there are 2 partitions", systemStreamPartitionMetadata.size(), 2);
assertEquals("there are 3 partitions", systemStreamPartitionMetadata.size(), 3);

SystemStreamMetadata.SystemStreamPartitionMetadata partition0Metadata =
systemStreamPartitionMetadata.get(new Partition(0));
Expand All @@ -205,6 +207,13 @@ public void testGetSystemStreamMetaDataForTopicWithNoMessage() {
assertEquals("upcoming offset for partition 1", partition1Metadata.getUpcomingOffset(), "0");
assertEquals("newest offset is not set due to abnormal upcoming offset", partition1Metadata.getNewestOffset(),
null);

SystemStreamMetadata.SystemStreamPartitionMetadata partition2Metadata =
systemStreamPartitionMetadata.get(new Partition(2));
assertEquals("oldest offset for partition 2", partition2Metadata.getOldestOffset(), "10");
assertEquals("upcoming offset for partition 2", partition2Metadata.getUpcomingOffset(), "10");
assertEquals("newest offset is not set due to abnormal upcoming offset", partition2Metadata.getNewestOffset(),
"10");
}

@Test
Expand Down