Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

[fix][transaction] Contains UUID when auto topic creation #1993

Merged
merged 1 commit into from
Aug 9, 2023
Merged

[fix][transaction] Contains UUID when auto topic creation #1993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion kafka-impl/src/main/java/io/streamnative/pulsar/handlers/kop/AdminManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import io.streamnative.pulsar.handlers.kop.exceptions.KoPTopicException;
import io.streamnative.pulsar.handlers.kop.storage.PartitionLog;
import io.streamnative.pulsar.handlers.kop.utils.KopTopic;
import io.streamnative.pulsar.handlers.kop.utils.delayed.DelayedOperation;
import io.streamnative.pulsar.handlers.kop.utils.delayed.DelayedOperationPurgatory;
Expand Down Expand Up @@ -136,7 +137,7 @@ public CompletableFuture<Map<String, ApiError>> createTopicsAsync(
return;
}
admin.topics().createPartitionedTopicAsync(kopTopic.getFullName(), numPartitions,
Map.of("kafkaTopicUUID", UUID.randomUUID().toString()))
Map.of(PartitionLog.KAFKA_TOPIC_UUID_PROPERTY_NAME, UUID.randomUUID().toString()))
.whenComplete((ignored, e) -> {
if (e == null) {
if (log.isDebugEnabled()) {
Expand Down
5 changes: 4 additions & 1 deletion kafka-impl/src/main/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
Expand Down Expand Up @@ -539,7 +540,9 @@ private CompletableFuture<TopicAndMetadata> getTopicMetadataAsync(String topic,
return;
}
if (allowed) {
admin.topics().createPartitionedTopicAsync(topic, defaultNumPartitions)
Map<String, String> properties =
Map.of(PartitionLog.KAFKA_TOPIC_UUID_PROPERTY_NAME, UUID.randomUUID().toString());
admin.topics().createPartitionedTopicAsync(topic, defaultNumPartitions, properties)
.whenComplete((__, createException) -> {
if (createException == null) {
future.complete(TopicAndMetadata.success(topic, defaultNumPartitions));
Expand Down
3 changes: 2 additions & 1 deletion kafka-impl/src/main/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class AnalyzeResult {
@Slf4j
public class PartitionLog {

public static final String KAFKA_TOPIC_UUID_PROPERTY_NAME = "kafkaTopicUUID";
private static final String PID_PREFIX = "KOP-PID-PREFIX";

private static final KopLogValidator.CompressionCodec DEFAULT_COMPRESSION =
Expand Down Expand Up @@ -212,7 +213,7 @@ private CompletableFuture<Void> loadTopicProperties() {
this.topicProperties = properties;
log.info("Topic properties for {} are {}", fullPartitionName, properties);
this.entryFormatter = buildEntryFormatter(topicProperties);
this.kafkaTopicUUID = properties.get("kafkaTopicUUID");
this.kafkaTopicUUID = properties.get(KAFKA_TOPIC_UUID_PROPERTY_NAME);
this.producerStateManager =
new ProducerStateManager(
fullPartitionName,
Expand Down
5 changes: 5 additions & 0 deletions tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
Expand All @@ -38,6 +39,7 @@
import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadata;
import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataManager;
import io.streamnative.pulsar.handlers.kop.offset.OffsetAndMetadata;
import io.streamnative.pulsar.handlers.kop.storage.PartitionLog;
import io.streamnative.pulsar.handlers.kop.utils.KafkaResponseUtils;
import io.streamnative.pulsar.handlers.kop.utils.TopicNameUtils;
import java.net.InetSocketAddress;
Expand Down Expand Up @@ -1024,6 +1026,9 @@ public void testBrokerHandleTopicMetadataRequestAllowAutoTopicCreation(boolean b
expectedError = null;
assertEquals(1, metadataResponse.topicMetadata().size());
assertEquals(topicName, metadataResponse.topicMetadata().iterator().next().topic());
Map<String, String> properties = admin.topics().getProperties(topicName);
assertFalse(properties.isEmpty());
assertTrue(properties.containsKey(PartitionLog.KAFKA_TOPIC_UUID_PROPERTY_NAME));
} else {
// topic does not exist and it is not created
expectedError = Errors.UNKNOWN_TOPIC_OR_PARTITION;
Expand Down
Loading