test server resources Change-Id: I08674a52897aa5b10abb128b4458aec3b7f65e40
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/095c584b Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/095c584b Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/095c584b Branch: refs/heads/oya Commit: 095c584b5168ebea32fca46683fb05c072a204bc Parents: 5c4a79b Author: Peter Cseh <[email protected]> Authored: Tue Nov 22 17:59:52 2016 +0100 Committer: Peter Cseh <[email protected]> Committed: Tue Nov 22 18:00:04 2016 +0100 ---------------------------------------------------------------------- .../test/java/org/apache/oozie/test/TestConfigurations.java | 7 ++++--- core/src/test/java/org/apache/oozie/test/XTestCase.java | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/095c584b/core/src/test/java/org/apache/oozie/test/TestConfigurations.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/TestConfigurations.java b/core/src/test/java/org/apache/oozie/test/TestConfigurations.java index c6c1d23..6942aad 100644 --- a/core/src/test/java/org/apache/oozie/test/TestConfigurations.java +++ b/core/src/test/java/org/apache/oozie/test/TestConfigurations.java @@ -36,7 +36,8 @@ class TestConfigurations { yarnConfig.setBoolean(YarnConfiguration.AUTO_FAILOVER_ENABLED, false); yarnConfig.set(YarnConfiguration.RM_WEBAPP_ADDRESS, "localhost:0"); - + yarnConfig.set(YarnConfiguration.NM_VCORES, "16"); + yarnConfig.set(YarnConfiguration.NM_PMEM_MB, "16000"); return yarnConfig; } @@ -56,10 +57,10 @@ class TestConfigurations { return jobConf; } - JobConf createPristineJobConf(final String jobTrackerUri, final String nameNodeUri) { + JobConf createPristineJobConf(final String resouceManagerUri, final String nameNodeUri) { final JobConf jobConf = new JobConf(); - jobConf.set("mapred.job.tracker", jobTrackerUri); + jobConf.set("yarn.resourcemanager.address", resouceManagerUri); jobConf.set("fs.default.name", nameNodeUri); return jobConf; http://git-wip-us.apache.org/repos/asf/oozie/blob/095c584b/core/src/test/java/org/apache/oozie/test/XTestCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java b/core/src/test/java/org/apache/oozie/test/XTestCase.java index 9820167..b29556c 100644 --- a/core/src/test/java/org/apache/oozie/test/XTestCase.java +++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java @@ -34,6 +34,7 @@ import junit.framework.TestCase; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.mutable.MutableObject; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.mapreduce.v2.MiniMRYarnCluster; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -509,7 +510,7 @@ public abstract class XTestCase extends TestCase { private static MiniDFSCluster dfsCluster = null; private static MiniDFSCluster dfsCluster2 = null; - private static MiniYARNCluster yarnCluster = null; + private static MiniMRYarnCluster yarnCluster = null; private static MiniHCatServer hcatServer = null; private static MiniHS2 hiveserver2 = null; private static HiveConf hs2Config = null; @@ -560,7 +561,7 @@ public abstract class XTestCase extends TestCase { private void setupYarnCluster(final JobConf dfsConfig) { final Configuration yarnConfig = testConfigurations.createYarnConfig(dfsConfig); - yarnCluster = new MiniYARNCluster(this.getClass().getName(), 1, 1, 1, 1); + yarnCluster = new MiniMRYarnCluster(this.getClass().getName()); yarnCluster.init(yarnConfig); yarnCluster.start(); }
