AHeise commented on a change in pull request #17119:
URL: https://github.com/apache/flink/pull/17119#discussion_r701318919
##########
File path:
flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/enumerator/PulsarSourceEnumerator.java
##########
@@ -148,8 +162,44 @@ public void close() {
* @return Set of subscribed {@link TopicPartition}s
*/
private Set<TopicPartition> getSubscribedTopicPartitions() {
- return subscriber.getSubscribedTopicPartitions(
- pulsarAdmin, rangeGenerator, context.currentParallelism());
+ int parallelism = context.currentParallelism();
+ Set<TopicPartition> partitions =
+ subscriber.getSubscribedTopicPartitions(pulsarAdmin,
rangeGenerator, parallelism);
+
+ // Seek start position for given partitions.
+ seekStartPosition(partitions);
+
+ return partitions;
+ }
+
+ private void seekStartPosition(Set<TopicPartition> partitions) {
+ ConsumerBuilder<byte[]> consumerBuilder =
+ createConsumerBuilder(pulsarClient, Schema.BYTES,
configuration);
+ Set<String> seekedPartitions = new HashSet<>();
+
+ for (TopicPartition partition : partitions) {
+ String topicName = partition.getFullTopicName();
+ if (!seekedPartitions.contains(topicName)) {
Review comment:
```suggestion
if (seekedPartitions.add(topicName)) {
```
##########
File path:
flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/PulsarSourceBuilder.java
##########
@@ -473,12 +473,13 @@
// Since these implementation could be a lambda, make sure they are
serializable.
checkState(isSerializable(startCursor), "StartCursor isn't
serializable");
checkState(isSerializable(stopCursor), "StopCursor isn't
serializable");
+ checkState(isSerializable(rangeGenerator), "RangeGenerator isn't
serializable");
// Make the configuration unmodifiable.
- UnmodifiableConfiguration config = new
UnmodifiableConfiguration(configuration);
+ UnmodifiableConfiguration immutableConfig = new
UnmodifiableConfiguration(configuration);
return new PulsarSource<>(
- config,
+ immutableConfig,
Review comment:
unnecessary changes
##########
File path:
flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/enumerator/PulsarSourceEnumerator.java
##########
@@ -148,8 +162,44 @@ public void close() {
* @return Set of subscribed {@link TopicPartition}s
*/
private Set<TopicPartition> getSubscribedTopicPartitions() {
- return subscriber.getSubscribedTopicPartitions(
- pulsarAdmin, rangeGenerator, context.currentParallelism());
+ int parallelism = context.currentParallelism();
+ Set<TopicPartition> partitions =
+ subscriber.getSubscribedTopicPartitions(pulsarAdmin,
rangeGenerator, parallelism);
+
+ // Seek start position for given partitions.
+ seekStartPosition(partitions);
+
+ return partitions;
+ }
+
+ private void seekStartPosition(Set<TopicPartition> partitions) {
+ ConsumerBuilder<byte[]> consumerBuilder =
+ createConsumerBuilder(pulsarClient, Schema.BYTES,
configuration);
+ Set<String> seekedPartitions = new HashSet<>();
+
+ for (TopicPartition partition : partitions) {
+ String topicName = partition.getFullTopicName();
+ if (!seekedPartitions.contains(topicName)) {
+ try (Consumer<byte[]> consumer =
+ sneakyClient(() ->
consumerBuilder.clone().topic(topicName).subscribe())) {
+ startCursor.seekPosition(
+ partition.getTopic(), partition.getPartitionId(),
consumer);
+ } catch (PulsarClientException e) {
+ if (sourceConfiguration.getVerifyInitialOffsets() ==
FAIL_ON_MISMATCH) {
+ throw new IllegalArgumentException(e);
+ } else {
+ // WARN_ON_MISMATCH would just print this warning
message.
+ // No need to print the stacktrace.
+ LOG.warn(
+ "Failed to set initial consuming position for
partition {}",
+ partition,
+ e);
+ }
+ }
+
+ seekedPartitions.add(topicName);
Review comment:
```suggestion
```
##########
File path:
flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/enumerator/PulsarSourceEnumerator.java
##########
@@ -148,8 +162,44 @@ public void close() {
* @return Set of subscribed {@link TopicPartition}s
*/
private Set<TopicPartition> getSubscribedTopicPartitions() {
- return subscriber.getSubscribedTopicPartitions(
- pulsarAdmin, rangeGenerator, context.currentParallelism());
+ int parallelism = context.currentParallelism();
+ Set<TopicPartition> partitions =
+ subscriber.getSubscribedTopicPartitions(pulsarAdmin,
rangeGenerator, parallelism);
+
+ // Seek start position for given partitions.
+ seekStartPosition(partitions);
+
+ return partitions;
+ }
+
+ private void seekStartPosition(Set<TopicPartition> partitions) {
+ ConsumerBuilder<byte[]> consumerBuilder =
+ createConsumerBuilder(pulsarClient, Schema.BYTES,
configuration);
+ Set<String> seekedPartitions = new HashSet<>();
+
+ for (TopicPartition partition : partitions) {
+ String topicName = partition.getFullTopicName();
Review comment:
When do we actually have duplicate topicNames? Is it for sticky keys?
##########
File path:
flink-connectors/flink-connector-pulsar/src/test/java/org/apache/flink/connector/pulsar/source/split/PulsarPartitionSplitTest.java
##########
@@ -1,54 +0,0 @@
-/*
- * 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.flink.connector.pulsar.source.split;
-
-import
org.apache.flink.connector.pulsar.source.enumerator.cursor.CursorPosition;
-import org.apache.flink.connector.pulsar.source.enumerator.cursor.StartCursor;
-import
org.apache.flink.connector.pulsar.source.enumerator.topic.TopicPartition;
-
-import org.apache.pulsar.client.impl.MessageIdImpl;
-import org.junit.jupiter.api.Test;
-
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-import static
org.apache.flink.connector.pulsar.source.enumerator.cursor.StartCursor.defaultStartCursor;
-import static
org.apache.flink.connector.pulsar.source.enumerator.cursor.StopCursor.defaultStopCursor;
-import static
org.apache.flink.connector.pulsar.source.enumerator.topic.TopicRange.createFullRange;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/** Unit tests for {@link PulsarPartitionSplit}. */
-class PulsarPartitionSplitTest {
-
- @Test
- void partitionSplitWouldHaveANewStartCursorWhenCheckpointing() {
Review comment:
Why did you remove this test?
##########
File path:
flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/enumerator/PulsarSourceEnumerator.java
##########
@@ -148,8 +162,44 @@ public void close() {
* @return Set of subscribed {@link TopicPartition}s
*/
private Set<TopicPartition> getSubscribedTopicPartitions() {
- return subscriber.getSubscribedTopicPartitions(
- pulsarAdmin, rangeGenerator, context.currentParallelism());
+ int parallelism = context.currentParallelism();
+ Set<TopicPartition> partitions =
+ subscriber.getSubscribedTopicPartitions(pulsarAdmin,
rangeGenerator, parallelism);
+
+ // Seek start position for given partitions.
+ seekStartPosition(partitions);
+
+ return partitions;
+ }
+
+ private void seekStartPosition(Set<TopicPartition> partitions) {
+ ConsumerBuilder<byte[]> consumerBuilder =
+ createConsumerBuilder(pulsarClient, Schema.BYTES,
configuration);
+ Set<String> seekedPartitions = new HashSet<>();
+
+ for (TopicPartition partition : partitions) {
+ String topicName = partition.getFullTopicName();
+ if (!seekedPartitions.contains(topicName)) {
+ try (Consumer<byte[]> consumer =
+ sneakyClient(() ->
consumerBuilder.clone().topic(topicName).subscribe())) {
+ startCursor.seekPosition(
+ partition.getTopic(), partition.getPartitionId(),
consumer);
+ } catch (PulsarClientException e) {
+ if (sourceConfiguration.getVerifyInitialOffsets() ==
FAIL_ON_MISMATCH) {
+ throw new IllegalArgumentException(e);
+ } else {
+ // WARN_ON_MISMATCH would just print this warning
message.
+ // No need to print the stacktrace.
+ LOG.warn(
+ "Failed to set initial consuming position for
partition {}",
+ partition,
+ e);
Review comment:
Get rid of `e` parameter? Or do we need the stacktrace?
##########
File path:
flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/reader/split/PulsarOrderedPartitionSplitReader.java
##########
@@ -75,7 +78,30 @@ protected void finishedPollMessage(Message<byte[]> message) {
@Override
protected void startConsumer(PulsarPartitionSplit split, Consumer<byte[]>
consumer) {
- initialStartPosition(split, consumer);
+ MessageId latestConsumedId = split.getLatestConsumedId();
+
+ // Reset the start position for ordered pulsar consumer.
+ if (latestConsumedId != null) {
+ StartCursor startCursor =
StartCursor.fromMessageId(latestConsumedId, false);
+ TopicPartition partition = split.getPartition();
+
+ try {
+ startCursor.seekPosition(
+ partition.getTopic(), partition.getPartitionId(),
consumer);
Review comment:
Why do we seek here? I thought the purpose was to only seek in
enumerator?
##########
File path:
flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/reader/split/PulsarUnorderedPartitionSplitReader.java
##########
@@ -137,16 +137,18 @@ protected void startConsumer(PulsarPartitionSplit split,
Consumer<byte[]> consum
// Redeliver unacknowledged messages because of the message is out
of order.
consumer.redeliverUnacknowledgedMessages();
- } else {
- initialStartPosition(split, consumer);
}
}
public PulsarPartitionSplitState snapshotState(long checkpointId) {
- TxnID txnID = PulsarTransactionUtils.getId(uncommittedTransaction);
- this.uncommittedTransaction = newTransaction();
PulsarPartitionSplitState state = new
PulsarPartitionSplitState(registeredSplit);
- state.setUncommittedTransactionId(txnID);
+
+ // Avoiding NP problem when Pulsar don't get the message before Flink
checkpoint.
+ if (uncommittedTransaction != null) {
Review comment:
Please add `@Nullable` to `uncommittedTransaction` field declaration
that helps IDE to warn us for such issues.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
