You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pb...@apache.org on 2016/12/13 13:20:05 UTC
[34/48] oozie git commit: Revert "test server resources"
Revert "test server resources"
This reverts commit 095c584b5168ebea32fca46683fb05c072a204bc.
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/04b96c66
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/04b96c66
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/04b96c66
Branch: refs/heads/oya
Commit: 04b96c66cafb5b5ef62bb52bd334ed87497c147e
Parents: 0e9162d
Author: Peter Bacsko <pb...@cloudera.com>
Authored: Mon Nov 28 13:53:43 2016 +0100
Committer: Peter Bacsko <pb...@cloudera.com>
Committed: Mon Nov 28 13:53:43 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, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/04b96c66/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 6942aad..c6c1d23 100644
--- a/core/src/test/java/org/apache/oozie/test/TestConfigurations.java
+++ b/core/src/test/java/org/apache/oozie/test/TestConfigurations.java
@@ -36,8 +36,7 @@ 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;
}
@@ -57,10 +56,10 @@ class TestConfigurations {
return jobConf;
}
- JobConf createPristineJobConf(final String resouceManagerUri, final String nameNodeUri) {
+ JobConf createPristineJobConf(final String jobTrackerUri, final String nameNodeUri) {
final JobConf jobConf = new JobConf();
- jobConf.set("yarn.resourcemanager.address", resouceManagerUri);
+ jobConf.set("mapred.job.tracker", jobTrackerUri);
jobConf.set("fs.default.name", nameNodeUri);
return jobConf;
http://git-wip-us.apache.org/repos/asf/oozie/blob/04b96c66/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 53d0a97..3f39f31 100644
--- a/core/src/test/java/org/apache/oozie/test/XTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java
@@ -34,7 +34,6 @@ 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;
@@ -511,7 +510,7 @@ public abstract class XTestCase extends TestCase {
private static MiniDFSCluster dfsCluster = null;
private static MiniDFSCluster dfsCluster2 = null;
- private static MiniMRYarnCluster yarnCluster = null;
+ private static MiniYARNCluster yarnCluster = null;
private static MiniHCatServer hcatServer = null;
private static MiniHS2 hiveserver2 = null;
private static HiveConf hs2Config = null;
@@ -562,7 +561,7 @@ public abstract class XTestCase extends TestCase {
private void setupYarnCluster(final JobConf dfsConfig) {
final Configuration yarnConfig = testConfigurations.createYarnConfig(dfsConfig);
- yarnCluster = new MiniMRYarnCluster(this.getClass().getName());
+ yarnCluster = new MiniYARNCluster(this.getClass().getName(), 1, 1, 1, 1);
yarnCluster.init(yarnConfig);
yarnCluster.start();
}