From bd7d867933843719650557054d04510d27c29dd4 Mon Sep 17 00:00:00 2001 From: Robert Metzger Date: Wed, 13 May 2015 11:57:11 +0200 Subject: [PATCH] [FLINK-1949] Fix issue detecting stopped detached YARN session --- .../java/org/apache/flink/yarn/YARNSessionFIFOITCase.java | 2 +- .../src/main/java/org/apache/flink/yarn/YarnTestBase.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java index 8c4dc4c8848..07300dad63e 100644 --- a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java +++ b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java @@ -472,7 +472,7 @@ public class YARNSessionFIFOITCase extends YarnTestBase { LOG.info("waiting for the job with appId {} to finish", tmpAppId); // wait until the app has finished - while(yc.getApplications(EnumSet.of(YarnApplicationState.RUNNING)).size() == 0) { + while(yc.getApplications(EnumSet.of(YarnApplicationState.RUNNING)).size() > 0) { sleep(500); } } else { 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 74855e647b2..79507921589 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 @@ -471,14 +471,15 @@ public abstract class YarnTestBase { expectedStringSeen = true; LOG.info("Found expected output in redirected streams"); // send "stop" command to command line interface + LOG.info("RunWithArgs: request runner to stop"); runner.sendStop(); // wait for the thread to stop try { - runner.join(1000); + runner.join(10000); } catch (InterruptedException e) { - LOG.warn("Interrupted while stopping runner", e); + LOG.debug("Interrupted while stopping runner", e); } - LOG.warn("stopped"); + LOG.warn("RunWithArgs runner stopped."); break; } // check if thread died -- GitLab