flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [89/89] [abbrv] flink git commit: [hotfix] Remove RecoveryMode from JobMaster
Date Thu, 25 Aug 2016 18:49:32 GMT
[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/73429761
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/73429761
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/73429761

Branch: refs/heads/flip-6
Commit: 734297615a772568ccbe0f5857f5df5d46d3acd3
Parents: 4515c85
Author: Stephan Ewen <sewen@apache.org>
Authored: Thu Aug 25 20:37:15 2016 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Thu Aug 25 20:37:15 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/73429761/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);
 	}


Mime
View raw message