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/05/14 17:11:32 UTC

flink git commit: [FLINK-1949] Fix issue detecting stopped detached YARN session

Repository: flink
Updated Branches:
  refs/heads/master 113b20b7f -> bd7d86793


[FLINK-1949] Fix issue detecting stopped detached YARN session


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/bd7d8679
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/bd7d8679
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/bd7d8679

Branch: refs/heads/master
Commit: bd7d867933843719650557054d04510d27c29dd4
Parents: 113b20b
Author: Robert Metzger <rm...@apache.org>
Authored: Wed May 13 11:57:11 2015 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Thu May 14 17:10:56 2015 +0200

----------------------------------------------------------------------
 .../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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/bd7d8679/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java
----------------------------------------------------------------------
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 8c4dc4c..07300da 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 {

http://git-wip-us.apache.org/repos/asf/flink/blob/bd7d8679/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 74855e6..7950792 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