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/01/22 22:12:15 UTC
[8/9] flink git commit: [hotfix] Remove sysout logging in
SavepointMigrationTestBase and fix several warnings.
[hotfix] Remove sysout logging in SavepointMigrationTestBase and fix several warnings.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2b3fd395
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2b3fd395
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2b3fd395
Branch: refs/heads/master
Commit: 2b3fd395ef254e8828e173b0afd23a1a9f7033a3
Parents: b8a784e
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Jan 20 18:49:57 2017 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 22 21:53:40 2017 +0100
----------------------------------------------------------------------
.../utils/SavepointMigrationTestBase.java | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2b3fd395/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java
index 80a66ac..1a8a0a0 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java
@@ -103,7 +103,8 @@ public class SavepointMigrationTestBase extends TestBaseUtils {
stopCluster(cluster, TestBaseUtils.DEFAULT_TIMEOUT);
}
- protected void executeAndSavepoint(
+ @SafeVarargs
+ protected final void executeAndSavepoint(
StreamExecutionEnvironment env,
String savepointPath,
Tuple2<String, Integer>... expectedAccumulators) throws Exception {
@@ -188,16 +189,14 @@ public class SavepointMigrationTestBase extends TestBaseUtils {
// FileUtils.moveFile(new File(new URI(path).getPath()), new File(savepointPath));
}
- protected void restoreAndExecute(
+ @SafeVarargs
+ protected final void restoreAndExecute(
StreamExecutionEnvironment env,
String savepointPath,
Tuple2<String, Integer>... expectedAccumulators) throws Exception {
- int parallelism = env.getParallelism();
-
// Retrieve the job manager
-
- ActorGateway jobManager = Await.result(cluster.leaderGateway().future(), DEADLINE.timeLeft());
+ Await.result(cluster.leaderGateway().future(), DEADLINE.timeLeft());
// Submit the job
JobGraph jobGraph = env.getStreamGraph().getJobGraph();
@@ -217,17 +216,15 @@ public class SavepointMigrationTestBase extends TestBaseUtils {
for (Tuple2<String, Integer> acc : expectedAccumulators) {
Integer numFinished = (Integer) accumulators.get(acc.f0);
if (numFinished == null) {
- System.out.println("NO ACC FOR " + acc);
allDone = false;
break;
}
if (!numFinished.equals(acc.f1)) {
- System.out.println("TO LOW FOR ACC" + acc);
allDone = false;
break;
}
}
- System.out.println("ACC: " + accumulators);
+
if (allDone) {
done = true;
break;