Zakelly commented on code in PR #24748:
URL: https://github.com/apache/flink/pull/24748#discussion_r1596216484
##########
flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/AbstractAsyncStateStreamOperator.java:
##########
@@ -259,6 +262,44 @@ public Object getCurrentKey() {
return currentProcessingContext.getKey();
}
+ @Override
+ public void processWatermark(Watermark mark) throws Exception {
+ if (!isAsyncStateProcessingEnabled()) {
+ // If async state processing is disabled, fallback to the super
class.
+ super.processWatermark(mark);
+ return;
+ }
+ asyncExecutionController
+ .getEpochManager()
+ .onNonRecord(
+ () -> {
+ try {
+ if (timeServiceManager != null) {
+ timeServiceManager.advanceWatermark(mark);
+ }
+ output.emitWatermark(mark);
+ } catch (Exception e) {
+ handleAsyncStateException(
+ String.format("Failed to process
watermark %s.", mark), e);
+ }
+ },
+ ParallelMode.SERIAL_BETWEEN_EPOCH);
Review Comment:
My suggestion:
1. `ParallelMode` could be configured within `EpochManager` or `AEC`, and
could be overridden from outside.
2. `AEC` should proxy the requests to `EpochManager`, the operator does not
know the details.
##########
flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/EpochManager.java:
##########
@@ -0,0 +1,202 @@
+/*
+ * 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.runtime.asyncprocessing;
+
+import javax.annotation.Nullable;
+
+import java.util.LinkedList;
+
+/**
+ * Epoch manager segments inputs into distinct epochs, marked by the arrival
of non-records(e.g.
+ * watermark, record attributes). Records are assigned to a unique epoch based
on their arrival,
+ * records within an epoch are allowed to be parallelized, while the
non-record of an epoch can only
+ * be executed when all records in this epoch have finished.
+ *
+ * <p>For more details please refer to FLIP-425.
+ */
+public class EpochManager {
+
+ /**
+ * This enum defines whether parallel execution between epochs is allowed.
We should keep this
+ * internal and away from API module for now, until we could see the
concrete need for {@link
+ * #PARALLEL_BETWEEN_EPOCH} from average users.
+ */
+ public enum ParallelMode {
+ /**
+ * Subsequent epochs must wait until the previous epoch is completed
before they can start.
+ */
+ SERIAL_BETWEEN_EPOCH,
+ /**
+ * Subsequent epochs can begin execution even if the previous epoch
has not yet completed.
+ * Usually performs better than {@link #SERIAL_BETWEEN_EPOCH}.
+ */
+ PARALLEL_BETWEEN_EPOCH
+ }
+
+ /**
+ * The reference to the {@link AsyncExecutionController}, used for {@link
+ * ParallelMode#SERIAL_BETWEEN_EPOCH}. Can be null when testing.
+ */
+ final AsyncExecutionController asyncExecutionController;
+
+ /** The number of epochs that have arrived. */
+ long epochNum;
+
+ /** The output queue to hold ongoing epochs. */
+ LinkedList<Epoch> outputQueue;
+
+ /** Current active epoch, only one active epoch at the same time. */
+ Epoch activeEpoch;
+
+ public EpochManager(AsyncExecutionController aec) {
+ this.epochNum = 0;
+ this.outputQueue = new LinkedList<>();
+ // preset an empty epoch, the epoch action will be updated when
non-record is received.
+ this.activeEpoch = new Epoch(epochNum++);
+ this.outputQueue.add(activeEpoch);
+ this.asyncExecutionController = aec;
+ }
+
+ /**
+ * Add a record to the current epoch and return the current open epoch,
the epoch will be
+ * associated with the {@link RecordContext} of this record. Must be
invoked within task thread.
+ *
+ * @return the current open epoch.
+ */
+ public Epoch onRecord() {
+ activeEpoch.ongoingRecordCount++;
+ return activeEpoch;
+ }
+
+ /**
+ * Add a non-record to the current epoch, close current epoch and open a
new epoch. Must be
+ * invoked within task thread.
+ *
+ * @param action the action associated with this non-record.
+ * @param parallelMode the parallel mode for this epoch.
+ */
+ public void onNonRecord(Runnable action, ParallelMode parallelMode) {
+ if (parallelMode == ParallelMode.PARALLEL_BETWEEN_EPOCH) {
+ activeEpoch.close(action);
+ if (outputQueue.size() == 1) { // which means the first epoch
+ if (activeEpoch.tryFinish()) {
+ outputQueue.pop();
+ }
+ }
+ activeEpoch = new Epoch(epochNum++);
+ outputQueue.add(activeEpoch);
+ } else {
+ assert outputQueue.size() == 1;
+ activeEpoch.close(action);
+ asyncExecutionController.drainInflightRecords(0);
+ if (activeEpoch.tryFinish() && outputQueue.size() > 0) {
+ outputQueue.pop();
+ }
+ activeEpoch = new Epoch(epochNum++);
+ outputQueue.add(activeEpoch);
+ }
+ }
+
+ /**
+ * Complete one record in the specific epoch. Must be invoked within task
thread.
+ *
+ * @param epoch the specific epoch
+ */
+ public void completeOneRecord(Epoch epoch) {
+ epoch.ongoingRecordCount--;
+ // If one epoch has been closed before and all records in
+ // this epoch have finished, the epoch will be removed from the output
queue.
+ while (!outputQueue.isEmpty() && outputQueue.peek().tryFinish()) {
+ outputQueue.pop();
+ }
Review Comment:
```suggestion
if (--epoch.ongoingRecordCount == 0) {
// If one epoch has been closed before and all records in
// this epoch have finished, the epoch will be removed from the
output queue.
while (!outputQueue.isEmpty() && outputQueue.peek().tryFinish()) {
outputQueue.pop();
}
}
```
##########
flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/EpochManager.java:
##########
@@ -0,0 +1,202 @@
+/*
+ * 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.runtime.asyncprocessing;
+
+import javax.annotation.Nullable;
+
+import java.util.LinkedList;
+
+/**
+ * Epoch manager segments inputs into distinct epochs, marked by the arrival
of non-records(e.g.
+ * watermark, record attributes). Records are assigned to a unique epoch based
on their arrival,
+ * records within an epoch are allowed to be parallelized, while the
non-record of an epoch can only
+ * be executed when all records in this epoch have finished.
+ *
+ * <p>For more details please refer to FLIP-425.
+ */
+public class EpochManager {
+
+ /**
+ * This enum defines whether parallel execution between epochs is allowed.
We should keep this
+ * internal and away from API module for now, until we could see the
concrete need for {@link
+ * #PARALLEL_BETWEEN_EPOCH} from average users.
+ */
+ public enum ParallelMode {
+ /**
+ * Subsequent epochs must wait until the previous epoch is completed
before they can start.
+ */
+ SERIAL_BETWEEN_EPOCH,
+ /**
+ * Subsequent epochs can begin execution even if the previous epoch
has not yet completed.
+ * Usually performs better than {@link #SERIAL_BETWEEN_EPOCH}.
+ */
+ PARALLEL_BETWEEN_EPOCH
+ }
+
+ /**
+ * The reference to the {@link AsyncExecutionController}, used for {@link
+ * ParallelMode#SERIAL_BETWEEN_EPOCH}. Can be null when testing.
+ */
+ final AsyncExecutionController asyncExecutionController;
+
+ /** The number of epochs that have arrived. */
+ long epochNum;
+
+ /** The output queue to hold ongoing epochs. */
+ LinkedList<Epoch> outputQueue;
+
+ /** Current active epoch, only one active epoch at the same time. */
+ Epoch activeEpoch;
+
+ public EpochManager(AsyncExecutionController aec) {
+ this.epochNum = 0;
+ this.outputQueue = new LinkedList<>();
+ // preset an empty epoch, the epoch action will be updated when
non-record is received.
+ this.activeEpoch = new Epoch(epochNum++);
+ this.outputQueue.add(activeEpoch);
+ this.asyncExecutionController = aec;
+ }
+
+ /**
+ * Add a record to the current epoch and return the current open epoch,
the epoch will be
+ * associated with the {@link RecordContext} of this record. Must be
invoked within task thread.
+ *
+ * @return the current open epoch.
+ */
+ public Epoch onRecord() {
+ activeEpoch.ongoingRecordCount++;
+ return activeEpoch;
+ }
+
+ /**
+ * Add a non-record to the current epoch, close current epoch and open a
new epoch. Must be
+ * invoked within task thread.
+ *
+ * @param action the action associated with this non-record.
+ * @param parallelMode the parallel mode for this epoch.
+ */
+ public void onNonRecord(Runnable action, ParallelMode parallelMode) {
+ if (parallelMode == ParallelMode.PARALLEL_BETWEEN_EPOCH) {
+ activeEpoch.close(action);
+ if (outputQueue.size() == 1) { // which means the first epoch
+ if (activeEpoch.tryFinish()) {
+ outputQueue.pop();
+ }
+ }
+ activeEpoch = new Epoch(epochNum++);
+ outputQueue.add(activeEpoch);
+ } else {
+ assert outputQueue.size() == 1;
+ activeEpoch.close(action);
+ asyncExecutionController.drainInflightRecords(0);
+ if (activeEpoch.tryFinish() && outputQueue.size() > 0) {
+ outputQueue.pop();
+ }
Review Comment:
need while() section as well
##########
flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/EpochManager.java:
##########
@@ -0,0 +1,202 @@
+/*
+ * 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.runtime.asyncprocessing;
+
+import javax.annotation.Nullable;
+
+import java.util.LinkedList;
+
+/**
+ * Epoch manager segments inputs into distinct epochs, marked by the arrival
of non-records(e.g.
+ * watermark, record attributes). Records are assigned to a unique epoch based
on their arrival,
+ * records within an epoch are allowed to be parallelized, while the
non-record of an epoch can only
+ * be executed when all records in this epoch have finished.
+ *
+ * <p>For more details please refer to FLIP-425.
+ */
+public class EpochManager {
+
+ /**
+ * This enum defines whether parallel execution between epochs is allowed.
We should keep this
+ * internal and away from API module for now, until we could see the
concrete need for {@link
+ * #PARALLEL_BETWEEN_EPOCH} from average users.
+ */
+ public enum ParallelMode {
+ /**
+ * Subsequent epochs must wait until the previous epoch is completed
before they can start.
+ */
+ SERIAL_BETWEEN_EPOCH,
+ /**
+ * Subsequent epochs can begin execution even if the previous epoch
has not yet completed.
+ * Usually performs better than {@link #SERIAL_BETWEEN_EPOCH}.
+ */
+ PARALLEL_BETWEEN_EPOCH
+ }
+
+ /**
+ * The reference to the {@link AsyncExecutionController}, used for {@link
+ * ParallelMode#SERIAL_BETWEEN_EPOCH}. Can be null when testing.
+ */
+ final AsyncExecutionController asyncExecutionController;
+
+ /** The number of epochs that have arrived. */
+ long epochNum;
+
+ /** The output queue to hold ongoing epochs. */
+ LinkedList<Epoch> outputQueue;
+
+ /** Current active epoch, only one active epoch at the same time. */
+ Epoch activeEpoch;
+
+ public EpochManager(AsyncExecutionController aec) {
+ this.epochNum = 0;
+ this.outputQueue = new LinkedList<>();
+ // preset an empty epoch, the epoch action will be updated when
non-record is received.
+ this.activeEpoch = new Epoch(epochNum++);
+ this.outputQueue.add(activeEpoch);
+ this.asyncExecutionController = aec;
+ }
+
+ /**
+ * Add a record to the current epoch and return the current open epoch,
the epoch will be
+ * associated with the {@link RecordContext} of this record. Must be
invoked within task thread.
+ *
+ * @return the current open epoch.
+ */
+ public Epoch onRecord() {
+ activeEpoch.ongoingRecordCount++;
+ return activeEpoch;
+ }
+
+ /**
+ * Add a non-record to the current epoch, close current epoch and open a
new epoch. Must be
+ * invoked within task thread.
+ *
+ * @param action the action associated with this non-record.
+ * @param parallelMode the parallel mode for this epoch.
+ */
+ public void onNonRecord(Runnable action, ParallelMode parallelMode) {
+ if (parallelMode == ParallelMode.PARALLEL_BETWEEN_EPOCH) {
+ activeEpoch.close(action);
+ if (outputQueue.size() == 1) { // which means the first epoch
+ if (activeEpoch.tryFinish()) {
+ outputQueue.pop();
+ }
+ }
+ activeEpoch = new Epoch(epochNum++);
+ outputQueue.add(activeEpoch);
Review Comment:
better extract this part into private method `initActive()`? And I'd suggest
not adding the `activeEpoch` into the queue.
##########
flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/EpochManager.java:
##########
@@ -0,0 +1,202 @@
+/*
+ * 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.runtime.asyncprocessing;
+
+import javax.annotation.Nullable;
+
+import java.util.LinkedList;
+
+/**
+ * Epoch manager segments inputs into distinct epochs, marked by the arrival
of non-records(e.g.
+ * watermark, record attributes). Records are assigned to a unique epoch based
on their arrival,
+ * records within an epoch are allowed to be parallelized, while the
non-record of an epoch can only
+ * be executed when all records in this epoch have finished.
+ *
+ * <p>For more details please refer to FLIP-425.
+ */
+public class EpochManager {
+
+ /**
+ * This enum defines whether parallel execution between epochs is allowed.
We should keep this
+ * internal and away from API module for now, until we could see the
concrete need for {@link
+ * #PARALLEL_BETWEEN_EPOCH} from average users.
+ */
+ public enum ParallelMode {
+ /**
+ * Subsequent epochs must wait until the previous epoch is completed
before they can start.
+ */
+ SERIAL_BETWEEN_EPOCH,
+ /**
+ * Subsequent epochs can begin execution even if the previous epoch
has not yet completed.
+ * Usually performs better than {@link #SERIAL_BETWEEN_EPOCH}.
+ */
+ PARALLEL_BETWEEN_EPOCH
+ }
+
+ /**
+ * The reference to the {@link AsyncExecutionController}, used for {@link
+ * ParallelMode#SERIAL_BETWEEN_EPOCH}. Can be null when testing.
+ */
+ final AsyncExecutionController asyncExecutionController;
+
+ /** The number of epochs that have arrived. */
+ long epochNum;
+
+ /** The output queue to hold ongoing epochs. */
+ LinkedList<Epoch> outputQueue;
+
+ /** Current active epoch, only one active epoch at the same time. */
+ Epoch activeEpoch;
+
+ public EpochManager(AsyncExecutionController aec) {
+ this.epochNum = 0;
+ this.outputQueue = new LinkedList<>();
+ // preset an empty epoch, the epoch action will be updated when
non-record is received.
+ this.activeEpoch = new Epoch(epochNum++);
+ this.outputQueue.add(activeEpoch);
+ this.asyncExecutionController = aec;
+ }
+
+ /**
+ * Add a record to the current epoch and return the current open epoch,
the epoch will be
+ * associated with the {@link RecordContext} of this record. Must be
invoked within task thread.
+ *
+ * @return the current open epoch.
+ */
+ public Epoch onRecord() {
+ activeEpoch.ongoingRecordCount++;
+ return activeEpoch;
+ }
+
+ /**
+ * Add a non-record to the current epoch, close current epoch and open a
new epoch. Must be
+ * invoked within task thread.
+ *
+ * @param action the action associated with this non-record.
+ * @param parallelMode the parallel mode for this epoch.
+ */
+ public void onNonRecord(Runnable action, ParallelMode parallelMode) {
+ if (parallelMode == ParallelMode.PARALLEL_BETWEEN_EPOCH) {
+ activeEpoch.close(action);
+ if (outputQueue.size() == 1) { // which means the first epoch
+ if (activeEpoch.tryFinish()) {
+ outputQueue.pop();
+ }
Review Comment:
need while() section as well
--
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: issues-unsubscr...@flink.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
