You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:37:03 UTC
svn commit: r1077618 -
/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/
Author: omalley
Date: Fri Mar 4 04:37:02 2011
New Revision: 1077618
URL: http://svn.apache.org/viewvc?rev=1077618&view=rev
Log:
commit 3d1120246eda098f8212a73c17754866ad27900e
Author: Vinay Kumar Thota <vi...@yahoo-inc.com>
Date: Thu Jul 29 09:05:22 2010 +0000
MAPREDUCE:1962 from https://issues.apache.org/jira/secure/attachment/12450796/1962-ydist-security.patch
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfMemoryExceedsTask.java
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfSuspendTask.java
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestLostTaskTracker.java
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskChildsKilling.java
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskKilling.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfMemoryExceedsTask.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfMemoryExceedsTask.java?rev=1077618&r1=1077617&r2=1077618&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfMemoryExceedsTask.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfMemoryExceedsTask.java Fri Mar 4 04:37:02 2011
@@ -62,12 +62,13 @@ public class TestChildsKillingOfMemoryEx
@BeforeClass
public static void before() throws Exception {
- Hashtable<String,Long> prop = new Hashtable<String,Long>();
+ Hashtable<String,Object> prop = new Hashtable<String,Object>();
prop.put("mapred.cluster.max.map.memory.mb", 2 * 1024L);
prop.put("mapred.cluster.map.memory.mb", 1024L);
prop.put("mapred.cluster.max.reduce.memory.mb", 2 * 1024L);
prop.put("mapred.cluster.reduce.memory.mb", 1024L);
prop.put("mapred.map.max.attempts", 1L);
+ prop.put("mapreduce.job.complete.cancel.delegation.tokens", false);
String [] expExcludeList = {"java.net.ConnectException",
"java.io.IOException"};
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfSuspendTask.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfSuspendTask.java?rev=1077618&r1=1077617&r2=1077618&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfSuspendTask.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfSuspendTask.java Fri Mar 4 04:37:02 2011
@@ -56,9 +56,10 @@ public class TestChildsKillingOfSuspendT
@BeforeClass
public static void before() throws Exception {
- Hashtable<String,Long> prop = new Hashtable<String,Long>();
+ Hashtable<String,Object> prop = new Hashtable<String,Object>();
prop.put("mapred.map.max.attempts",1L);
prop.put("mapred.task.timeout",30000L);
+ prop.put("mapreduce.job.complete.cancel.delegation.tokens", false);
String [] expExcludeList = {"java.net.ConnectException",
"java.io.IOException"};
cluster = MRCluster.createCluster(conf);
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestLostTaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestLostTaskTracker.java?rev=1077618&r1=1077617&r2=1077618&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestLostTaskTracker.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestLostTaskTracker.java Fri Mar 4 04:37:02 2011
@@ -44,8 +44,9 @@ public class TestLostTaskTracker {
cluster = MRCluster.createCluster(conf);
cluster.setExcludeExpList(expExcludeList);
cluster.setUp();
- Hashtable<String,Long> prop = new Hashtable<String,Long>();
+ Hashtable<String,Object> prop = new Hashtable<String,Object>();
prop.put("mapred.tasktracker.expiry.interval",30000L);
+ prop.put("mapreduce.job.complete.cancel.delegation.tokens",false);
cluster.restartClusterWithNewConfig(prop, confFile);
UtilsForTests.waitFor(1000);
conf = cluster.getJTClient().getProxy().getDaemonConf();
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskChildsKilling.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskChildsKilling.java?rev=1077618&r1=1077617&r2=1077618&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskChildsKilling.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskChildsKilling.java Fri Mar 4 04:37:02 2011
@@ -64,8 +64,9 @@ public class TestTaskChildsKilling {
@BeforeClass
public static void before() throws Exception {
- Hashtable<String,Long> prop = new Hashtable<String,Long>();
+ Hashtable<String,Object> prop = new Hashtable<String,Object>();
prop.put("mapred.map.max.attempts", 1L);
+ prop.put("mapreduce.job.complete.cancel.delegation.tokens",false);
String [] expExcludeList = {"java.net.ConnectException",
"java.io.IOException"};
cluster = MRCluster.createCluster(conf);
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskKilling.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskKilling.java?rev=1077618&r1=1077617&r2=1077618&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskKilling.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestTaskKilling.java Fri Mar 4 04:37:02 2011
@@ -410,11 +410,19 @@ public class TestTaskKilling {
isTempFolderExists);
counter = 0;
while (counter < 30) {
+ if (taskInfo.getTaskStatus().length > 0) {
+ break;
+ }
UtilsForTests.waitFor(1000);
taskInfo = remoteJTClient.getTaskInfo(tID);
counter ++;
}
+ while (taskInfo.getTaskStatus()[0].getRunState() ==
+ TaskStatus.State.RUNNING) {
+ UtilsForTests.waitFor(1000);
+ taskInfo = remoteJTClient.getTaskInfo(tID);
+ }
Assert.assertEquals("Task status has not been changed to FAILED.",
taskInfo.getTaskStatus()[0].getRunState(),
TaskStatus.State.FAILED);