Skip to content

Backport FLINK-27917 and drop consumer seek method. #204

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
syhily merged 2 commits into from
Aug 26, 2022
Merged

Backport FLINK-27917 and drop consumer seek method. #204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6b5bd6
Backport FLINK-27917 and drop consumer seek method.
syhily Aug 26, 2022
7b8a1fc
Merge branch 'develop' into yufan/backport/FLINK-27917
syhily Aug 26, 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
37 changes: 26 additions & 11 deletions ...apache/flink/connector/pulsar/source/reader/split/PulsarPartitionSplitReaderTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@
import org.apache.flink.connector.pulsar.testutils.extension.TestOrderlinessExtension;
import org.apache.flink.util.TestLoggerExtension;

import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.client.impl.MessageIdImpl;
Expand Down Expand Up @@ -61,7 +60,6 @@
import static java.util.Collections.singletonList;
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
import static org.apache.flink.connector.pulsar.common.utils.PulsarExceptionUtils.sneakyAdmin;
import static org.apache.flink.connector.pulsar.common.utils.PulsarExceptionUtils.sneakyThrow;
import static org.apache.flink.connector.pulsar.source.PulsarSourceOptions.PULSAR_DEFAULT_FETCH_TIME;
import static org.apache.flink.connector.pulsar.source.PulsarSourceOptions.PULSAR_ENABLE_AUTO_ACKNOWLEDGE_MESSAGE;
import static org.apache.flink.connector.pulsar.source.PulsarSourceOptions.PULSAR_MAX_FETCH_RECORDS;
Expand Down Expand Up @@ -135,14 +133,31 @@ private void seekStartPositionAndHandleSplit(
new PulsarPartitionSplit(partition, StopCursor.never(), null, null);
SplitsAddition<PulsarPartitionSplit> addition = new SplitsAddition<>(singletonList(split));

// create consumer and seek before split changes
try (Consumer<byte[]> consumer = reader.createPulsarConsumer(partition)) {
// inclusive messageId
consumer.seek(startPosition);
} catch (PulsarClientException e) {
sneakyThrow(e);
// Create the subscription and set the start position for this reader.
// Remember not to use Consumer.seek(startPosition)
SourceConfiguration sourceConfiguration = reader.sourceConfiguration;
PulsarAdmin pulsarAdmin = reader.pulsarAdmin;
String subscriptionName = sourceConfiguration.getSubscriptionName();
List<String> subscriptions =
sneakyAdmin(() -> pulsarAdmin.topics().getSubscriptions(topicName));
if (!subscriptions.contains(subscriptionName)) {
// If this subscription is not available. Just create it.
sneakyAdmin(
() ->
pulsarAdmin
.topics()
.createSubscription(
topicName, subscriptionName, startPosition));
} else {
// Reset the subscription if this is existed.
sneakyAdmin(
() ->
pulsarAdmin
.topics()
.resetCursor(topicName, subscriptionName, startPosition));
}

// Accept the split and start consuming.
reader.handleSplitsChanges(addition);
}

Expand Down Expand Up @@ -199,7 +214,7 @@ void pollMessageAfterTimeout(PulsarPartitionSplitReaderBase splitReader)
String topicName = randomAlphabetic(10);

// Add a split
seekStartPositionAndHandleSplit(splitReader, topicName, 0);
handleSplit(splitReader, topicName, 0);

// Poll once with a null message
Message<byte[]> message1 = fetchedMessage(splitReader);
Expand All @@ -223,7 +238,7 @@ void pollMessageAfterTimeout(PulsarPartitionSplitReaderBase splitReader)
void consumeMessageCreatedAfterHandleSplitChangesAndFetch(
PulsarPartitionSplitReaderBase splitReader) {
String topicName = randomAlphabetic(10);
seekStartPositionAndHandleSplit(splitReader, topicName, 0);
handleSplit(splitReader, topicName, 0);
operator().sendMessage(topicNameWithPartition(topicName, 0), STRING, randomAlphabetic(10));
fetchedMessages(splitReader, 1, true);
}
Expand Down