Skip to content

KAFKA-13546: Do not fail connector if default topic creation group is explicitly specified #11615

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

Merged
C0urante merged 2 commits into from
Aug 2, 2022
Merged

KAFKA-13546: Do not fail connector if default topic creation group is explicitly specified #11615

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
4ad7081
KAFKA-13546 Do not fail connector if default topic creation group is …
venkatteki Dec 19, 2021
54a06fb
fix test
venkatteki Jan 19, 2022
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
11 changes: 11 additions & 0 deletions connect/runtime/src/main/java/org/apache/kafka/connect/runtime/SourceConnectorConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static org.apache.kafka.connect.runtime.TopicCreationConfig.DEFAULT_TOPIC_CREATION_GROUP;
import static org.apache.kafka.connect.runtime.TopicCreationConfig.DEFAULT_TOPIC_CREATION_PREFIX;
Expand All @@ -38,6 +40,8 @@

public class SourceConnectorConfig extends ConnectorConfig {

private static final Logger log = LoggerFactory.getLogger(SourceConnectorConfig.class);

protected static final String TOPIC_CREATION_GROUP = "Topic Creation";

public static final String TOPIC_CREATION_PREFIX = "topic.creation.";
Expand Down Expand Up @@ -98,6 +102,13 @@ public static ConfigDef enrich(ConfigDef baseConfigDef, Map<String, String> prop
topicCreationGroups.addAll((List<?>) aliases);
}

//Remove "topic.creation.groups" config if its present and the value is "default"
if (topicCreationGroups.contains(DEFAULT_TOPIC_CREATION_GROUP)) {
log.warn("'{}' topic creation group always exists and does not need to be listed explicitly",
DEFAULT_TOPIC_CREATION_GROUP);
topicCreationGroups.removeAll(Collections.singleton(DEFAULT_TOPIC_CREATION_GROUP));
}

ConfigDef newDef = new ConfigDef(baseConfigDef);
String defaultGroupPrefix = TOPIC_CREATION_PREFIX + DEFAULT_TOPIC_CREATION_GROUP + ".";
short defaultGroupReplicationFactor = defaultGroupConfig.getShort(defaultGroupPrefix + REPLICATION_FACTOR_CONFIG);
Expand Down
13 changes: 13 additions & 0 deletions ...ect/runtime/src/test/java/org/apache/kafka/connect/runtime/SourceConnectorConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG;
import static org.apache.kafka.connect.runtime.ConnectorConfig.NAME_CONFIG;
import static org.apache.kafka.connect.runtime.ConnectorConfigTest.MOCK_PLUGINS;
import static org.apache.kafka.connect.runtime.SourceConnectorConfig.TOPIC_CREATION_GROUPS_CONFIG;
import static org.apache.kafka.connect.runtime.TopicCreationConfig.DEFAULT_TOPIC_CREATION_GROUP;
import static org.apache.kafka.connect.runtime.TopicCreationConfig.DEFAULT_TOPIC_CREATION_PREFIX;
import static org.apache.kafka.connect.runtime.TopicCreationConfig.PARTITIONS_CONFIG;
Expand All @@ -47,6 +48,8 @@
public class SourceConnectorConfigTest {

private static final String FOO_CONNECTOR = "foo-source";
private static final String TOPIC_CREATION_GROUP_1 = "group1";
private static final String TOPIC_CREATION_GROUP_2 = "group2";
private static final short DEFAULT_REPLICATION_FACTOR = -1;
private static final int DEFAULT_PARTITIONS = -1;

Expand All @@ -64,6 +67,16 @@ public Map<String, String> defaultConnectorPropsWithTopicCreation() {
return props;
}

@Test
public void shouldNotFailWithExplicitlySpecifiedDefaultTopicCreationGroup() {
Map<String, String> props = defaultConnectorProps();
props.put(TOPIC_CREATION_GROUPS_CONFIG, String.join(",", DEFAULT_TOPIC_CREATION_GROUP,
TOPIC_CREATION_GROUP_1, TOPIC_CREATION_GROUP_2));
props.put(DEFAULT_TOPIC_CREATION_PREFIX + REPLICATION_FACTOR_CONFIG, "1");
props.put(DEFAULT_TOPIC_CREATION_PREFIX + PARTITIONS_CONFIG, "1");
SourceConnectorConfig config = new SourceConnectorConfig(MOCK_PLUGINS, props, true);
}

@Test
public void noTopicCreation() {
Map<String, String> props = defaultConnectorProps();
Expand Down