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 2016/12/23 20:22:40 UTC
[21/52] [abbrv] flink git commit: Rebasing fixes on latest master
Rebasing fixes on latest master
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6f691ad5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6f691ad5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6f691ad5
Branch: refs/heads/master
Commit: 6f691ad5f60fd966f7cb72836ddf8fae8a5559c5
Parents: 6484f45
Author: Till Rohrmann <tr...@apache.org>
Authored: Thu Oct 20 19:54:12 2016 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Dec 23 20:54:24 2016 +0100
----------------------------------------------------------------------
.../runtime/checkpoint/CheckpointCoordinatorGateway.java | 8 ++++----
.../runtime/taskexecutor/rpc/RpcCheckpointResponder.java | 4 ++--
.../org/apache/flink/runtime/jobmanager/JobSubmitTest.java | 2 ++
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/6f691ad5/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorGateway.java
index 5ed7985..8d1423a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorGateway.java
@@ -25,10 +25,10 @@ import org.apache.flink.runtime.rpc.RpcGateway;
public interface CheckpointCoordinatorGateway extends RpcGateway {
void acknowledgeCheckpoint(
- JobID jobID,
- ExecutionAttemptID executionAttemptID,
- CheckpointMetaData checkpointInfo,
- SubtaskState checkpointStateHandles);
+ final JobID jobID,
+ final ExecutionAttemptID executionAttemptID,
+ final CheckpointMetaData checkpointMetaData,
+ final SubtaskState subtaskState);
void declineCheckpoint(
JobID jobID,
http://git-wip-us.apache.org/repos/asf/flink/blob/6f691ad5/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/rpc/RpcCheckpointResponder.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/rpc/RpcCheckpointResponder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/rpc/RpcCheckpointResponder.java
index 85bdbff..1ce4350 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/rpc/RpcCheckpointResponder.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/rpc/RpcCheckpointResponder.java
@@ -39,13 +39,13 @@ public class RpcCheckpointResponder implements CheckpointResponder {
JobID jobID,
ExecutionAttemptID executionAttemptID,
CheckpointMetaData checkpointMetaData,
- SubtaskState checkpointStateHandles) {
+ SubtaskState subtaskState) {
checkpointCoordinatorGateway.acknowledgeCheckpoint(
jobID,
executionAttemptID,
checkpointMetaData,
- checkpointStateHandles);
+ subtaskState);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/6f691ad5/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java
index 53bd318..07e1644 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java
@@ -171,6 +171,8 @@ public class JobSubmitTest {
JobVertex jobVertex = new JobVertex("Vertex that fails in initializeOnMaster") {
+ private static final long serialVersionUID = -3540303593784587652L;
+
@Override
public void initializeOnMaster(ClassLoader loader) throws Exception {
throw new RuntimeException("test exception");