Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 86C0E200B6B for ; Thu, 25 Aug 2016 20:48:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 855B3160ABD; Thu, 25 Aug 2016 18:48:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2BAE9160AD5 for ; Thu, 25 Aug 2016 20:48:11 +0200 (CEST) Received: (qmail 18620 invoked by uid 500); 25 Aug 2016 18:48:07 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 16305 invoked by uid 99); 25 Aug 2016 18:48:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Aug 2016 18:48:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 361A2E1075; Thu, 25 Aug 2016 18:48:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sewen@apache.org To: commits@flink.apache.org Date: Thu, 25 Aug 2016 18:49:32 -0000 Message-Id: <6dbe9eab817f4ad3acd2cd79b26790ba@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [89/89] [abbrv] flink git commit: [hotfix] Remove RecoveryMode from JobMaster archived-at: Thu, 25 Aug 2016 18:48:15 -0000 [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 Authored: Thu Aug 25 20:37:15 2016 +0200 Committer: Stephan Ewen 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 { /** 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 { this.jobID = Preconditions.checkNotNull(jobGraph.getJobID()); this.configuration = Preconditions.checkNotNull(configuration); - this.recoveryMode = RecoveryMode.fromConfig(configuration); this.highAvailabilityServices = Preconditions.checkNotNull(highAvailabilityService); }