You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2018/05/23 15:41:20 UTC
[2/5] flink git commit: [hotfix] [runtime] Remove dead code for
handling no longer thrown InterruptedException
[hotfix] [runtime] Remove dead code for handling no longer thrown InterruptedException
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/dd236f51
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/dd236f51
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/dd236f51
Branch: refs/heads/master
Commit: dd236f51dc51f499de6beba09a2de4c8cd37cb27
Parents: e754d3d
Author: Stephan Ewen <se...@apache.org>
Authored: Thu May 17 16:09:07 2018 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Wed May 23 17:28:55 2018 +0200
----------------------------------------------------------------------
.../runtime/io/RecordWriterOutput.java | 2 +-
.../streaming/runtime/tasks/OperatorChain.java | 22 ++++++--------------
2 files changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/dd236f51/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java
index d62d80e..d2b4d1f 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java
@@ -148,7 +148,7 @@ public class RecordWriterOutput<OUT> implements OperatorChain.WatermarkGaugeExpo
}
}
- public void broadcastEvent(AbstractEvent event) throws IOException, InterruptedException {
+ public void broadcastEvent(AbstractEvent event) throws IOException {
recordWriter.broadcastEvent(event);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/dd236f51/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java
index b99cf65..1db4346 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java
@@ -179,26 +179,16 @@ public class OperatorChain<OUT, OP extends StreamOperator<OUT>> implements Strea
}
public void broadcastCheckpointBarrier(long id, long timestamp, CheckpointOptions checkpointOptions) throws IOException {
- try {
- CheckpointBarrier barrier = new CheckpointBarrier(id, timestamp, checkpointOptions);
- for (RecordWriterOutput<?> streamOutput : streamOutputs) {
- streamOutput.broadcastEvent(barrier);
- }
- }
- catch (InterruptedException e) {
- throw new IOException("Interrupted while broadcasting checkpoint barrier");
+ CheckpointBarrier barrier = new CheckpointBarrier(id, timestamp, checkpointOptions);
+ for (RecordWriterOutput<?> streamOutput : streamOutputs) {
+ streamOutput.broadcastEvent(barrier);
}
}
public void broadcastCheckpointCancelMarker(long id) throws IOException {
- try {
- CancelCheckpointMarker barrier = new CancelCheckpointMarker(id);
- for (RecordWriterOutput<?> streamOutput : streamOutputs) {
- streamOutput.broadcastEvent(barrier);
- }
- }
- catch (InterruptedException e) {
- throw new IOException("Interrupted while broadcasting checkpoint cancellation");
+ CancelCheckpointMarker barrier = new CancelCheckpointMarker(id);
+ for (RecordWriterOutput<?> streamOutput : streamOutputs) {
+ streamOutput.broadcastEvent(barrier);
}
}