forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
…pache#9907) Fixes apache#9851 ### Motivation Pulsar IO Source connector cannot pass message properties to destination topic, as apache#9851 discussed, it is a bug that `forwardSourceMessageProperty` is not applied to Source connector properly. ### Modifications - add `forwardSourceMessageProperty` to `SourceConfig` - add set `forwardSourceMessageProperty` from pulsar admin client - add related logic in `SourceConfigUtils` - add integration test
- Loading branch information
Showing
8 changed files
with
264 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
...st-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestPropertySource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /** | ||
| * 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.pulsar.tests.integration.io; | ||
|
|
||
| import org.apache.pulsar.functions.api.Record; | ||
| import org.apache.pulsar.io.core.Source; | ||
| import org.apache.pulsar.io.core.SourceContext; | ||
|
|
||
| import java.nio.ByteBuffer; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
|
|
||
| public class TestPropertySource implements Source<String> { | ||
|
|
||
| @Override | ||
| public void open(Map<String, Object> config, SourceContext sourceContext) throws Exception { | ||
| } | ||
|
|
||
| @Override | ||
| public Record<String> read() throws Exception { | ||
| Thread.sleep(50); | ||
| return new Record<String>() { | ||
| @Override | ||
| public Optional<String> getKey() { | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getValue() { | ||
| return "property"; | ||
| } | ||
| @Override | ||
| public Map<String, String> getProperties() { | ||
| HashMap<String, String> props = new HashMap<String, String>(); | ||
| props.put("hello", "world"); | ||
| props.put("foo", "bar"); | ||
| return props; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws Exception { | ||
|
|
||
| } | ||
| } |
169 changes: 169 additions & 0 deletions
169
...ration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarSourcePropertyTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| /** | ||
| * 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.pulsar.tests.integration.io; | ||
|
|
||
| import lombok.Cleanup; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.pulsar.client.admin.PulsarAdmin; | ||
| import org.apache.pulsar.client.admin.PulsarAdminException; | ||
| import org.apache.pulsar.client.api.Consumer; | ||
| import org.apache.pulsar.client.api.Message; | ||
| import org.apache.pulsar.client.api.Producer; | ||
| import org.apache.pulsar.client.api.PulsarClient; | ||
| import org.apache.pulsar.client.api.Schema; | ||
| import org.apache.pulsar.client.api.SubscriptionType; | ||
| import org.apache.pulsar.common.functions.FunctionState; | ||
| import org.apache.pulsar.common.policies.data.SinkStatus; | ||
| import org.apache.pulsar.common.policies.data.SourceStatus; | ||
| import org.apache.pulsar.tests.integration.docker.ContainerExecException; | ||
| import org.apache.pulsar.tests.integration.docker.ContainerExecResult; | ||
| import org.apache.pulsar.tests.integration.functions.utils.CommandGenerator; | ||
| import org.apache.pulsar.tests.integration.functions.utils.CommandGenerator.Runtime; | ||
| import org.apache.pulsar.tests.integration.suites.PulsarStandaloneTestSuite; | ||
| import org.apache.pulsar.tests.integration.topologies.PulsarCluster; | ||
| import org.awaitility.Awaitility; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import static java.nio.charset.StandardCharsets.UTF_8; | ||
| import static org.apache.pulsar.tests.integration.functions.utils.CommandGenerator.JAVAJAR; | ||
| import static org.apache.pulsar.tests.integration.suites.PulsarTestSuite.retryStrategically; | ||
| import static org.testng.Assert.assertEquals; | ||
| import static org.testng.Assert.assertTrue; | ||
| import static org.testng.Assert.fail; | ||
|
|
||
| /** | ||
| * Source Property related test cases. | ||
| */ | ||
| @Slf4j | ||
| public class PulsarSourcePropertyTest extends PulsarStandaloneTestSuite { | ||
| @Test(groups = {"source"}) | ||
| public void testSourceProperty() throws Exception { | ||
| String outputTopicName = "test-source-property-input-" + randomName(8); | ||
| String sourceName = "test-source-property-" + randomName(8); | ||
| submitSourceConnector(sourceName, outputTopicName, "org.apache.pulsar.tests.integration.io.TestPropertySource", JAVAJAR); | ||
|
|
||
| // get source info | ||
| getSourceInfoSuccess(sourceName); | ||
|
|
||
| // get source status | ||
| getSourceStatus(sourceName); | ||
|
|
||
| try (PulsarAdmin admin = PulsarAdmin.builder().serviceHttpUrl(container.getHttpServiceUrl()).build()) { | ||
|
|
||
| Awaitility.await().ignoreExceptions().untilAsserted(() -> { | ||
| SourceStatus status = admin.sources().getSourceStatus("public", "default", sourceName); | ||
| assertEquals(status.getInstances().size(), 1); | ||
| assertTrue(status.getInstances().get(0).getStatus().numWritten > 0); | ||
| }); | ||
| } | ||
|
|
||
| @Cleanup PulsarClient client = PulsarClient.builder() | ||
| .serviceUrl(container.getPlainTextServiceUrl()) | ||
| .build(); | ||
| @Cleanup Consumer<String> consumer = client.newConsumer(Schema.STRING) | ||
| .topic(outputTopicName) | ||
| .subscriptionType(SubscriptionType.Exclusive) | ||
| .subscriptionName("test-sub") | ||
| .subscribe(); | ||
|
|
||
| for (int i = 0; i < 10; i++) { | ||
| Message<String> msg = consumer.receive(); | ||
| assertEquals(msg.getValue(), "property"); | ||
| assertEquals(msg.getProperty("hello"), "world"); | ||
| assertEquals(msg.getProperty("foo"), "bar"); | ||
| } | ||
|
|
||
| // delete source | ||
| deleteSource(sourceName); | ||
|
|
||
| getSourceInfoNotFound(sourceName); | ||
| } | ||
|
|
||
| private void submitSourceConnector(String sourceName, | ||
| String outputTopicName, | ||
| String className, | ||
| String archive) throws Exception { | ||
| String[] commands = { | ||
| PulsarCluster.ADMIN_SCRIPT, | ||
| "sources", "create", | ||
| "--name", sourceName, | ||
| "--destinationTopicName", outputTopicName, | ||
| "--archive", archive, | ||
| "--classname", className | ||
| }; | ||
| log.info("Run command : {}", StringUtils.join(commands, ' ')); | ||
| ContainerExecResult result = container.execCmd(commands); | ||
| assertTrue( | ||
| result.getStdout().contains("\"Created successfully\""), | ||
| result.getStdout()); | ||
| } | ||
|
|
||
| private void getSourceInfoSuccess(String sourceName) throws Exception { | ||
| ContainerExecResult result = container.execCmd( | ||
| PulsarCluster.ADMIN_SCRIPT, | ||
| "sources", | ||
| "get", | ||
| "--tenant", "public", | ||
| "--namespace", "default", | ||
| "--name", sourceName | ||
| ); | ||
| assertTrue(result.getStdout().contains("\"name\": \"" + sourceName + "\"")); | ||
| } | ||
|
|
||
| private void getSourceStatus(String sourceName) throws Exception { | ||
| ContainerExecResult result = container.execCmd( | ||
| PulsarCluster.ADMIN_SCRIPT, | ||
| "sources", | ||
| "status", | ||
| "--tenant", "public", | ||
| "--namespace", "default", | ||
| "--name", sourceName | ||
| ); | ||
| assertTrue(result.getStdout().contains("\"running\" : true")); | ||
| } | ||
|
|
||
| private void deleteSource(String sourceName) throws Exception { | ||
| ContainerExecResult result = container.execCmd( | ||
| PulsarCluster.ADMIN_SCRIPT, | ||
| "sources", | ||
| "delete", | ||
| "--tenant", "public", | ||
| "--namespace", "default", | ||
| "--name", sourceName | ||
| ); | ||
| assertTrue(result.getStdout().contains("Delete source successfully")); | ||
| result.assertNoStderr(); | ||
| } | ||
|
|
||
| private void getSourceInfoNotFound(String sourceName) throws Exception { | ||
| try { | ||
| container.execCmd( | ||
| PulsarCluster.ADMIN_SCRIPT, | ||
| "sources", | ||
| "get", | ||
| "--tenant", "public", | ||
| "--namespace", "default", | ||
| "--name", sourceName); | ||
| fail("Command should have exited with non-zero"); | ||
| } catch (ContainerExecException e) { | ||
| assertTrue(e.getResult().getStderr().contains("Reason: Source " + sourceName + " doesn't exist")); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters