[hotfix] Don't use tmp directory for rescaling savepoints
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e04639d1 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e04639d1 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e04639d1 Branch: refs/heads/master Commit: e04639d10da1d949f95bdf00534e85a30b11a284 Parents: 28c2616 Author: Till Rohrmann <[email protected]> Authored: Fri Feb 23 13:57:10 2018 +0100 Committer: Till Rohrmann <[email protected]> Committed: Sat Feb 24 15:04:39 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/flink/runtime/jobmaster/JobMaster.java | 4 ++-- .../org/apache/flink/runtime/jobmaster/JobMasterGateway.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/e04639d1/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java index f7841e2..ecb2280 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java @@ -522,7 +522,7 @@ public class JobMaster extends FencedRpcEndpoint<JobMasterId> implements JobMast // 4. take a savepoint final CompletableFuture<String> savepointFuture = triggerSavepoint( - jobMasterConfiguration.getTmpDirectory(), + null, timeout) .handleAsync( (String savepointPath, Throwable throwable) -> { @@ -1055,7 +1055,7 @@ public class JobMaster extends FencedRpcEndpoint<JobMasterId> implements JobMast @Override public CompletableFuture<String> triggerSavepoint( - final String targetDirectory, + @Nullable final String targetDirectory, final Time timeout) { try { return executionGraph.getCheckpointCoordinator() http://git-wip-us.apache.org/repos/asf/flink/blob/e04639d1/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java index fb53237..6173a26 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java @@ -44,6 +44,8 @@ import org.apache.flink.runtime.taskexecutor.slot.SlotOffer; import org.apache.flink.runtime.taskmanager.TaskExecutionState; import org.apache.flink.runtime.taskmanager.TaskManagerLocation; +import javax.annotation.Nullable; + import java.util.Collection; import java.util.concurrent.CompletableFuture; @@ -254,12 +256,13 @@ public interface JobMasterGateway extends /** * Triggers taking a savepoint of the executed job. * - * @param targetDirectory to which to write the savepoint data + * @param targetDirectory to which to write the savepoint data or null if the + * default savepoint directory should be used * @param timeout for the rpc call * @return Future which is completed with the savepoint path once completed */ CompletableFuture<String> triggerSavepoint( - final String targetDirectory, + @Nullable final String targetDirectory, final Time timeout); /**
