You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2015/09/09 10:02:09 UTC
flink git commit: [FLINK-2392] Improve YARN test stability
Repository: flink
Updated Branches:
refs/heads/master 304139d48 -> e45fdf711
[FLINK-2392] Improve YARN test stability
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e45fdf71
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e45fdf71
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e45fdf71
Branch: refs/heads/master
Commit: e45fdf71136cb37618fabd7b4bd6179c5c6f5a55
Parents: 304139d
Author: Robert Metzger <rm...@apache.org>
Authored: Sun Aug 30 13:54:15 2015 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Wed Sep 9 09:07:26 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/flink/yarn/YarnTestBase.java | 12 +++++-------
.../java/org/apache/flink/yarn/FlinkYarnCluster.java | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/e45fdf71/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java
index 4399f19..84a7a76 100644
--- a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java
+++ b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java
@@ -462,7 +462,7 @@ public abstract class YarnTestBase extends TestLogger {
runner.join(30000);
}
catch (InterruptedException e) {
- LOG.debug("Interrupted while stopping runner", e);
+ LOG.warn("Interrupted while stopping runner", e);
}
LOG.warn("RunWithArgs runner stopped.");
}
@@ -548,12 +548,10 @@ public abstract class YarnTestBase extends TestLogger {
@AfterClass
public static void tearDown() {
- //shutdown YARN cluster
- if (yarnCluster != null) {
- LOG.info("Shutting down MiniYarn cluster");
- yarnCluster.stop();
- yarnCluster = null;
- }
+ /*
+ We don't shut down the MiniCluster, as it is prone to blocking infinitely.
+ */
+
// When we are on travis, we copy the tmp files of JUnit (containing the MiniYARNCluster log files)
// to <flinkRoot>/target/flink-yarn-tests-*.
// The files from there are picked up by the ./tools/travis_watchdog.sh script
http://git-wip-us.apache.org/repos/asf/flink/blob/e45fdf71/flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnCluster.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnCluster.java b/flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnCluster.java
index 560a584..310fb83 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnCluster.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnCluster.java
@@ -427,7 +427,7 @@ public class FlinkYarnCluster extends AbstractFlinkYarnCluster {
Await.ready(response, akkaDuration);
} catch(Exception e) {
- throw new RuntimeException("Error while stopping YARN Application Client", e);
+ LOG.warn("Error while stopping YARN Application Client", e);
}
}