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 2015/03/20 10:19:27 UTC
flink git commit: [FLINK-1721] [yarn] Temporarily disable search for
exceptions in the YARN log due to akka bug
Repository: flink
Updated Branches:
refs/heads/master ceea93d41 -> 1b6903216
[FLINK-1721] [yarn] Temporarily disable search for exceptions in the YARN log due to akka bug
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1b690321
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1b690321
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1b690321
Branch: refs/heads/master
Commit: 1b6903216b320dd44110241779b90f56cf7fb91e
Parents: ceea93d
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Mar 19 18:31:06 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Mar 20 10:18:45 2015 +0100
----------------------------------------------------------------------
.../yarn/YARNSessionCapacitySchedulerITCase.java | 8 +++++---
.../apache/flink/yarn/YARNSessionFIFOITCase.java | 16 ++++++----------
.../java/org/apache/flink/yarn/YarnTestBase.java | 15 ++++-----------
3 files changed, 15 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1b690321/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
index 4179549..ff58cf0 100644
--- a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
+++ b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
@@ -21,6 +21,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
import org.apache.log4j.Level;
+import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -55,8 +56,6 @@ public class YARNSessionCapacitySchedulerITCase extends YarnTestBase {
"-jm", "512",
"-tm", "1024", "-qu", "qa-team"},
"Number of connected TaskManagers changed to 1. Slots available: 1", RunTypes.YARN_SESSION);
-
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
@@ -73,7 +72,10 @@ public class YARNSessionCapacitySchedulerITCase extends YarnTestBase {
"-tm", "1024",
"-qu", "doesntExist"}, "to unknown queue: doesntExist", RunTypes.YARN_SESSION);
checkForLogString("The specified queue 'doesntExist' does not exist. Available queues: default, qa-team");
+ }
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
+ @After
+ public void checkForProhibitedLogContents() {
+ ensureNoProhibitedStringInLogFiles(PROHIBITED_STRINGS);
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/1b690321/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 dcbd80a..60d414f 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
@@ -41,6 +41,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
import org.apache.log4j.Level;
import org.codehaus.jettison.json.JSONObject;
+import org.junit.After;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -81,6 +82,11 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
startYARNWithConfig(yarnConfiguration);
}
+ @After
+ public void checkForProhibitedLogContents() {
+ ensureNoProhibitedStringInLogFiles(PROHIBITED_STRINGS);
+ }
+
/**
* Test regular operation, including command line parameter parsing.
*/
@@ -93,7 +99,6 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
"-tm", "1024"},
"Number of connected TaskManagers changed to 1. Slots available: 1", RunTypes.YARN_SESSION);
LOG.info("Finished testClientStartup()");
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
/**
@@ -133,7 +138,6 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
}
LOG.info("Finished testDetachedMode()");
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
/**
@@ -273,7 +277,6 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
remoteUgi.getTokenIdentifiers().remove(nmIdent);
LOG.info("Finished testTaskManagerFailure()");
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
/**
@@ -286,7 +289,6 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
LOG.info("Starting testQueryCluster()");
runWithArgs(new String[] {"-q"}, "Summary: totalMemory 8192 totalCores 1332", RunTypes.YARN_SESSION); // we have 666*2 cores.
LOG.info("Finished testQueryCluster()");
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
/**
@@ -302,7 +304,6 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
"-tm", "1024",
"-qu", "doesntExist"}, "Number of connected TaskManagers changed to 1. Slots available: 1", RunTypes.YARN_SESSION);
LOG.info("Finished testNonexistingQueue()");
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
/**
@@ -321,7 +322,6 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
"-tm", "1024"}, "Number of connected TaskManagers changed to", RunTypes.YARN_SESSION); // the number of TMs depends on the speed of the test hardware
LOG.info("Finished testMoreNodesThanAvailable()");
checkForLogString("This YARN session requires 10752MB of memory in the cluster. There are currently only 8192MB available.");
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
/**
@@ -380,7 +380,6 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
LOG.info("Finished testfullAlloc()");
checkForLogString("There is not enough memory available in the YARN cluster. The TaskManager(s) require 3840MB each. NodeManagers available: [4096, 4096]\n" +
"After allocating the JobManager (512MB) and (1/2) TaskManagers, the following NodeManagers are available: [3584, 256]");
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
/**
@@ -399,7 +398,6 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
"-yjm", "512",
"-ytm", "1024", exampleJarLocation.getAbsolutePath()}, "Job execution switched to status FINISHED.", RunTypes.CLI_FRONTEND);
LOG.info("Finished perJobYarnCluster()");
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
/**
@@ -456,8 +454,6 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
// shutdown cluster
yarnCluster.shutdown();
LOG.info("Finished testJavaAPI()");
-
- ensureNoProhibitedStringInLogFiles(prohibtedStrings);
}
public boolean ignoreOnTravis() {
http://git-wip-us.apache.org/repos/asf/flink/blob/1b690321/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 55806ad..8924eea 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
@@ -64,7 +64,7 @@ import java.util.concurrent.ConcurrentMap;
* This class is located in a different package which is build after flink-dist. This way,
* we can use the YARN uberjar of flink to start a Flink YARN session.
*
- * The test is not threadsafe. Parallel execution of tests is not possible!
+ * The test is not thread-safe. Parallel execution of tests is not possible!
*/
public abstract class YarnTestBase {
private static final Logger LOG = LoggerFactory.getLogger(YarnTestBase.class);
@@ -77,8 +77,8 @@ public abstract class YarnTestBase {
protected final static int NUM_NODEMANAGERS = 2;
// The tests are scanning for these strings in the final output.
- protected final static String[] prohibtedStrings = {
- "Exception", // we don't want any exceptions to happen
+ protected final static String[] PROHIBITED_STRINGS = {
+// "Exception", // we don't want any exceptions to happen
"Started SelectChannelConnector@0.0.0.0:8081" // Jetty should start on a random port in YARN mode.
};
@@ -88,7 +88,6 @@ public abstract class YarnTestBase {
protected static MiniYARNCluster yarnCluster = null;
protected static File flinkUberjar;
- private static File yarnConfFile;
protected static final Configuration yarnConfiguration;
static {
@@ -327,7 +326,7 @@ public abstract class YarnTestBase {
File flinkConfFilePath = findFile(flinkDistRootDir, new ContainsName("flink-conf.yaml"));
Assert.assertNotNull(flinkConfFilePath);
map.put("FLINK_CONF_DIR", flinkConfFilePath.getParent());
- yarnConfFile = writeYarnSiteConfigXML(conf);
+ File yarnConfFile = writeYarnSiteConfigXML(conf);
map.put("YARN_CONF_DIR", yarnConfFile.getParentFile().getAbsolutePath());
map.put("IN_TESTS", "yes we are in tests"); // see FlinkYarnClient() for more infos
setEnv(map);
@@ -358,9 +357,6 @@ public abstract class YarnTestBase {
/**
* This method returns once the "startedAfterString" has been seen.
- * @param args
- * @param startedAfterString
- * @param type
*/
protected Runner startWithArgs(String[] args, String startedAfterString, RunTypes type) {
LOG.info("Running with args {}", Arrays.toString(args));
@@ -399,9 +395,6 @@ public abstract class YarnTestBase {
/**
* The test has been passed once the "terminateAfterString" has been seen.
- * @param args
- * @param terminateAfterString
- * @param type
*/
protected void runWithArgs(String[] args, String terminateAfterString, RunTypes type) {
LOG.info("Running with args {}", Arrays.toString(args));