You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2016/10/02 21:58:15 UTC
[10/50] [abbrv] flink git commit: [hotfix] Remove RecoveryMode from
JobMaster
[hotfix] Remove RecoveryMode from JobMaster
The recovery mode is not used any more by the latest CheckpointCoordinator.
All difference in recovery logic between high-availability and non-high-availability
is encapsulated in the HighAvailabilityServices.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1a8a9935
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1a8a9935
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1a8a9935
Branch: refs/heads/flip-6
Commit: 1a8a9935a0052335f0601f5352d0b5c022e8bd82
Parents: 2991cdb
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Aug 25 20:37:15 2016 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Sun Oct 2 23:44:42 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/runtime/rpc/jobmaster/JobMaster.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1a8a9935/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMaster.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMaster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMaster.java
index 49b200b..a046cb8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMaster.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMaster.java
@@ -22,7 +22,6 @@ import org.apache.flink.api.common.JobID;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.runtime.jobmanager.RecoveryMode;
import org.apache.flink.runtime.leaderelection.LeaderContender;
import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.messages.Acknowledge;
@@ -57,7 +56,6 @@ public class JobMaster extends RpcEndpoint<JobMasterGateway> {
/** Configuration of the job */
private final Configuration configuration;
- private final RecoveryMode recoveryMode;
/** Service to contend for and retrieve the leadership of JM and RM */
private final HighAvailabilityServices highAvailabilityServices;
@@ -86,7 +84,6 @@ public class JobMaster extends RpcEndpoint<JobMasterGateway> {
this.jobID = Preconditions.checkNotNull(jobGraph.getJobID());
this.configuration = Preconditions.checkNotNull(configuration);
- this.recoveryMode = RecoveryMode.fromConfig(configuration);
this.highAvailabilityServices = Preconditions.checkNotNull(highAvailabilityService);
}