Repository: flink Updated Branches: refs/heads/master bb26c9e1b -> f4c336b16
[hotfix] [checkpointing] Fix error message in SavepointLoader The message referred to parallelism although max parallelism is checked. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f4c336b1 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f4c336b1 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f4c336b1 Branch: refs/heads/master Commit: f4c336b16bb9219f438551ba069707c21e555de5 Parents: bb26c9e Author: Ufuk Celebi <[email protected]> Authored: Thu Nov 3 13:24:04 2016 +0100 Committer: Ufuk Celebi <[email protected]> Committed: Thu Nov 3 13:24:22 2016 +0100 ---------------------------------------------------------------------- .../flink/runtime/checkpoint/savepoint/SavepointLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f4c336b1/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointLoader.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointLoader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointLoader.java index 1819120..66740c7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointLoader.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointLoader.java @@ -74,12 +74,12 @@ public class SavepointLoader { String msg = String.format("Failed to rollback to savepoint %s. " + "Max parallelism mismatch between savepoint state and new program. " + "Cannot map operator %s with max parallelism %d to new program with " + - "parallelism %d. This indicates that the program has been changed " + + "max parallelism %d. This indicates that the program has been changed " + "in a non-compatible way after the savepoint.", savepoint, taskState.getJobVertexID(), taskState.getMaxParallelism(), - executionJobVertex.getParallelism()); + executionJobVertex.getMaxParallelism()); throw new IllegalStateException(msg); }
