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 2017/10/27 16:26:21 UTC
[4/8] flink git commit: [hotfix] [checkpoints] Remove unused and
obsolete start()/stop() methods on CheckpointRecoveryFactory
[hotfix] [checkpoints] Remove unused and obsolete start()/stop() methods on CheckpointRecoveryFactory
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/64bbf1d8
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/64bbf1d8
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/64bbf1d8
Branch: refs/heads/master
Commit: 64bbf1d865ad7f90d2b99f0a7d11146fd6ae54de
Parents: fe3b276
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Oct 26 18:29:34 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Oct 27 17:37:23 2017 +0200
----------------------------------------------------------------------
.../checkpoint/CheckpointRecoveryFactory.java | 15 ---------------
.../StandaloneCheckpointRecoveryFactory.java | 10 ----------
.../ZooKeeperCheckpointRecoveryFactory.java | 10 ----------
.../apache/flink/runtime/jobmanager/JobManager.scala | 14 --------------
.../runtime/jobmanager/JobManagerHARecoveryTest.java | 8 --------
5 files changed, 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/64bbf1d8/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointRecoveryFactory.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointRecoveryFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointRecoveryFactory.java
index 3fb1385..a3718a8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointRecoveryFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointRecoveryFactory.java
@@ -26,21 +26,6 @@ import org.apache.flink.api.common.JobID;
public interface CheckpointRecoveryFactory {
/**
- * The number of {@link CompletedCheckpoint} instances to retain.
- */
- int NUMBER_OF_SUCCESSFUL_CHECKPOINTS_TO_RETAIN = 1;
-
- /**
- * Starts the {@link CheckpointRecoveryFactory} service.
- */
- void start();
-
- /**
- * Stops the {@link CheckpointRecoveryFactory} service.
- */
- void stop();
-
- /**
* Creates a {@link CompletedCheckpointStore} instance for a job.
*
* @param jobId Job ID to recover checkpoints for
http://git-wip-us.apache.org/repos/asf/flink/blob/64bbf1d8/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/StandaloneCheckpointRecoveryFactory.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/StandaloneCheckpointRecoveryFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/StandaloneCheckpointRecoveryFactory.java
index 2d2cc2a..6d12d25 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/StandaloneCheckpointRecoveryFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/StandaloneCheckpointRecoveryFactory.java
@@ -27,16 +27,6 @@ import org.apache.flink.runtime.jobmanager.HighAvailabilityMode;
public class StandaloneCheckpointRecoveryFactory implements CheckpointRecoveryFactory {
@Override
- public void start() {
- // Nothing to do
- }
-
- @Override
- public void stop() {
- // Nothing to do
- }
-
- @Override
public CompletedCheckpointStore createCheckpointStore(JobID jobId, int maxNumberOfCheckpointsToRetain, ClassLoader userClassLoader)
throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/64bbf1d8/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java
index d60b26f..069cce5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java
@@ -49,16 +49,6 @@ public class ZooKeeperCheckpointRecoveryFactory implements CheckpointRecoveryFac
}
@Override
- public void start() {
- // Nothing to do
- }
-
- @Override
- public void stop() {
- // Nothing to do
- }
-
- @Override
public CompletedCheckpointStore createCheckpointStore(JobID jobId, int maxNumberOfCheckpointsToRetain, ClassLoader userClassLoader)
throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/64bbf1d8/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index 7ac965a..0435046 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -205,14 +205,6 @@ class JobManager(
throw new RuntimeException("Could not start the submitted job graphs service.", e)
}
- try {
- checkpointRecoveryFactory.start()
- } catch {
- case e: Exception =>
- log.error("Could not start the checkpoint recovery service.", e)
- throw new RuntimeException("Could not start the checkpoint recovery service.", e)
- }
-
jobManagerMetricGroup match {
case Some(group) =>
instantiateMetrics(group)
@@ -254,12 +246,6 @@ class JobManager(
case e: Exception => log.error("Could not properly stop the submitted job graphs service.")
}
- try {
- checkpointRecoveryFactory.stop()
- } catch {
- case e: Exception => log.error("Could not properly stop the checkpoint recovery service.")
- }
-
if (archive != ActorRef.noSender) {
archive ! decorateMessage(PoisonPill)
}
http://git-wip-us.apache.org/repos/asf/flink/blob/64bbf1d8/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
index d4bed23..7df26fc 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
@@ -470,14 +470,6 @@ public class JobManagerHARecoveryTest extends TestLogger {
}
@Override
- public void start() {
- }
-
- @Override
- public void stop() {
- }
-
- @Override
public CompletedCheckpointStore createCheckpointStore(JobID jobId, int maxNumberOfCheckpointsToRetain, ClassLoader userClassLoader) throws Exception {
return store;
}