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 ac...@apache.org on 2011/08/18 00:08:31 UTC
svn commit: r1158935 [3/3] - in
/hadoop/common/branches/MR-279-merge/hadoop-mapreduce: ./ assembly/
hadoop-mr-client/ hadoop-mr-client/hadoop-mapreduce-client-app/
hadoop-mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/
had...
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLinuxResourceCalculatorPlugin.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLinuxResourceCalculatorPlugin.java?rev=1158935&r1=1158914&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLinuxResourceCalculatorPlugin.java (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLinuxResourceCalculatorPlugin.java Wed Aug 17 22:08:08 2011
@@ -26,8 +26,6 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.yarn.util.LinuxResourceCalculatorPlugin;
-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
import org.junit.Test;
/**
@@ -173,7 +171,7 @@ public class TestLinuxResourceCalculator
updateStatFile(uTime, nTime, sTime);
assertEquals(plugin.getCumulativeCpuTime(),
FAKE_JIFFY_LENGTH * (uTime + nTime + sTime));
- assertEquals(plugin.getCpuUsage(), (float)(ResourceCalculatorPlugin.UNAVAILABLE));
+ assertEquals(plugin.getCpuUsage(), (float)(LinuxResourceCalculatorPlugin.UNAVAILABLE));
// Advance the time and sample again to test the CPU usage calculation
uTime += 100L;
Copied: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml (from r1158914, hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml?p2=hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml&p1=hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/pom.xml&r1=1158914&r2=1158935&rev=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/pom.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml Wed Aug 17 22:08:08 2011
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<project>
<parent>
- <artifactId>yarn-server</artifactId>
+ <artifactId>hadoop-yarn-server</artifactId>
<groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-common</artifactId>
- <name>yarn-server-common</name>
+ <artifactId>hadoop-yarn-server-common</artifactId>
+ <name>hadoop-yarn-server-common</name>
<properties>
<install.file>${project.artifact.file}</install.file>
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-common</artifactId>
+ <artifactId>hadoop-yarn-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -56,7 +56,7 @@
<configuration>
<executable>protoc</executable>
<arguments>
- <argument>-I../../yarn-api/src/main/proto/</argument>
+ <argument>-I../../hadoop-yarn-api/src/main/proto/</argument>
<argument>-Isrc/main/proto/</argument>
<argument>--java_out=target/generated-sources/proto</argument>
<argument>src/main/proto/yarn_server_common_protos.proto</argument>
Copied: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml (from r1158914, hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml?p2=hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml&p1=hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/pom.xml&r1=1158914&r2=1158935&rev=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/pom.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml Wed Aug 17 22:08:08 2011
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<project>
<parent>
- <artifactId>yarn-server</artifactId>
+ <artifactId>hadoop-yarn-server</artifactId>
<groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-nodemanager</artifactId>
- <name>yarn-server-nodemanager</name>
+ <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+ <name>hadoop-yarn-server-nodemanager</name>
<properties>
<install.file>${project.artifact.file}</install.file>
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-common</artifactId>
+ <artifactId>hadoop-yarn-server-common</artifactId>
</dependency>
</dependencies>
@@ -137,7 +137,7 @@
<configuration>
<executable>protoc</executable>
<arguments>
- <argument>-I../../yarn-api/src/main/proto/</argument>
+ <argument>-I../../hadoop-yarn-api/src/main/proto/</argument>
<argument>-Isrc/main/proto/</argument>
<argument>--java_out=target/generated-sources/proto</argument>
<argument>src/main/proto/yarn_server_nodemanager_service_protos.proto</argument>
Copied: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml (from r1158914, hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml?p2=hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml&p1=hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/pom.xml&r1=1158914&r2=1158935&rev=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/pom.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml Wed Aug 17 22:08:08 2011
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<project>
<parent>
- <artifactId>yarn-server</artifactId>
+ <artifactId>hadoop-yarn-server</artifactId>
<groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-resourcemanager</artifactId>
- <name>yarn-server-resourcemanager</name>
+ <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+ <name>hadoop-yarn-server-resourcemanager</name>
<properties>
<install.file>${project.artifact.file}</install.file>
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-common</artifactId>
+ <artifactId>hadoop-yarn-server-common</artifactId>
</dependency>
</dependencies>
Copied: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml (from r1158914, hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml?p2=hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml&p1=hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/pom.xml&r1=1158914&r2=1158935&rev=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/pom.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml Wed Aug 17 22:08:08 2011
@@ -1,13 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>yarn-server</artifactId>
+ <artifactId>hadoop-yarn-server</artifactId>
<groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version>
</parent>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-tests</artifactId>
- <name>yarn-server-tests</name>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <name>hadoop-yarn-server-tests</name>
<properties>
<install.file>${project.artifact.file}</install.file>
@@ -17,15 +17,15 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-common</artifactId>
+ <artifactId>hadoop-yarn-server-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-nodemanager</artifactId>
+ <artifactId>hadoop-yarn-server-nodemanager</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-resourcemanager</artifactId>
+ <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
</dependency>
</dependencies>
Copied: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/pom.xml (from r1158914, hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/pom.xml?p2=hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/pom.xml&p1=hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/pom.xml&r1=1158914&r2=1158935&rev=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/pom.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/pom.xml Wed Aug 17 22:08:08 2011
@@ -1,29 +1,29 @@
<?xml version="1.0"?>
<project>
<parent>
- <artifactId>yarn</artifactId>
+ <artifactId>hadoop-yarn</artifactId>
<groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server</artifactId>
- <name>yarn-server</name>
+ <artifactId>hadoop-yarn-server</artifactId>
+ <name>hadoop-yarn-server</name>
<packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-common</artifactId>
+ <artifactId>hadoop-yarn-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
<modules>
- <module>yarn-server-common</module>
- <module>yarn-server-nodemanager</module>
- <module>yarn-server-resourcemanager</module>
- <module>yarn-server-tests</module>
+ <module>hadoop-yarn-server-common</module>
+ <module>hadoop-yarn-server-nodemanager</module>
+ <module>hadoop-yarn-server-resourcemanager</module>
+ <module>hadoop-yarn-server-tests</module>
</modules>
</project>
Copied: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/pom.xml (from r1158914, hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/pom.xml?p2=hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/pom.xml&p1=hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml&r1=1158914&r2=1158935&rev=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/hadoop-yarn/pom.xml Wed Aug 17 22:08:08 2011
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn</artifactId>
+ <artifactId>hadoop-yarn</artifactId>
<version>${yarn.version}</version>
<packaging>pom</packaging>
- <name>yarn</name>
+ <name>hadoop-yarn</name>
<url>http://hadoop.apache.org/mapreduce</url>
<properties>
@@ -157,39 +157,44 @@
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-api</artifactId>
+ <artifactId>hadoop-yarn-api</artifactId>
<version>${yarn.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-common</artifactId>
+ <artifactId>hadoop-yarn-common</artifactId>
<version>${yarn.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-common</artifactId>
+ <artifactId>hadoop-yarn-common</artifactId>
<version>${yarn.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-common</artifactId>
+ <artifactId>hadoop-yarn-server-common</artifactId>
<version>${yarn.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-resourcemanager</artifactId>
+ <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
<version>${yarn.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>yarn-server-nodemanager</artifactId>
+ <artifactId>hadoop-yarn-server-nodemanager</artifactId>
<version>${yarn.version}</version>
</dependency>
<dependency>
@@ -393,8 +398,8 @@
</profiles>
<modules>
- <module>yarn-api</module>
- <module>yarn-common</module>
- <module>yarn-server</module>
+ <module>hadoop-yarn-api</module>
+ <module>hadoop-yarn-common</module>
+ <module>hadoop-yarn-server</module>
</modules>
</project>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/ivy.xml Wed Aug 17 22:08:08 2011
@@ -59,9 +59,9 @@
<dependencies>
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="compile->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
- rev="${hadoop-common.version}" conf="compile->default"/>
+ rev="${hadoop-common.version}" conf="compile->default" />
<dependency org="org.apache.hadoop" name="hadoop-common-test"
- rev="${hadoop-common.version}" conf="compile->default"/>
+ rev="${hadoop-common.version}" conf="compile->default" />
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-hdfs.version}" conf="compile->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-instrumented"
@@ -70,8 +70,8 @@
rev="${hadoop-common.version}" conf="system->default"/>
<dependency org="commons-logging" name="commons-logging"
rev="${commons-logging.version}" conf="compile->master"/>
- <dependency org="log4j" name="log4j" rev="${log4j.version}"
- conf="compile->master"/>
+ <!-- <dependency org="log4j" name="log4j" rev="${log4j.version}"
+ conf="compile->master"/>-->
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"
conf="compile->master"/>
@@ -82,6 +82,22 @@
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-server-common"
+ rev="${yarn.version}" conf="compile->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="compile->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="compile->default"/>
+ <dependency org="log4j" name="log4j" rev="${log4j.version}"
+ conf="compile->master"/>
+
+ <!--
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="test->default">
+ <artifact name="hadoop-yarn-common" type="jar" ext="jar" classifier="tests"/>
+ </dependency>
+ -->
+
<dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
conf="checkstyle->default"/>
@@ -100,7 +116,7 @@
<dependency org="org.apache.lucene" name="lucene-core"
rev="${lucene-core.version}" conf="javadoc->default"/>
- <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}"
+ <dependency org="org.apache.avro" name="avro" rev="${avro.version}"
conf="compile->default">
<exclude module="ant"/>
<exclude module="jetty"/>
@@ -124,6 +140,7 @@
<exclude org="com.sun.jmx"/>
<exclude org="javax.jms"/>
<exclude org="javax.mail"/>
+ <exclude org="org.apache.hadoop" module="avro"/>
</dependencies>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/ivy/libraries.properties?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/ivy/libraries.properties (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/ivy/libraries.properties Wed Aug 17 22:08:08 2011
@@ -20,7 +20,7 @@ ant-task.version=2.0.10
#This property has to be updated synchronously with aop.xml
aspectj.version=1.6.5
-avro.version=1.3.2
+avro.version=1.4.1
checkstyle.version=4.2
@@ -81,3 +81,5 @@ wagon-http.version=1.0-beta-2
xmlenc.version=0.52
xerces.version=1.4.4
+yarn.version=1.0-SNAPSHOT
+hadoop-mapreduce.version=1.0-SNAPSHOT
Copied: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/pom.xml (from r1158914, hadoop/common/branches/MR-279/mapreduce/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/pom.xml?p2=hadoop/common/branches/MR-279-merge/hadoop-mapreduce/pom.xml&p1=hadoop/common/branches/MR-279/mapreduce/pom.xml&r1=1158914&r2=1158935&rev=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/pom.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/pom.xml Wed Aug 17 22:08:08 2011
@@ -105,6 +105,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -209,6 +210,7 @@
<systemPropertyVariables>
<build.dir>${project.build.directory}</build.dir>
<build.output.dir>${project.build.outputDirectory}</build.output.dir>
+ <log4j.configuration>file:/home/vinodkv/Workspace/eclipse-workspace/apache-git/hadoop-common/mapreduce/src/test/log4j.properties</log4j.configuration>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -359,8 +361,8 @@
</profiles>
<modules>
- <module>yarn</module>
- <module>mr-client</module>
+ <module>hadoop-yarn</module>
+ <module>hadoop-mr-client</module>
</modules>
<reporting>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/block_forensics/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/block_forensics/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/block_forensics/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/block_forensics/ivy.xml Wed Aug 17 22:08:08 2011
@@ -44,5 +44,7 @@
<dependencies>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
</dependencies>
</ivy-module>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/capacity-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/capacity-scheduler/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/capacity-scheduler/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/capacity-scheduler/ivy.xml Wed Aug 17 22:08:08 2011
@@ -50,6 +50,10 @@
rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
<dependency org="commons-cli" name="commons-cli"
rev="${commons-cli.version}" conf="common->default"/>
<dependency org="commons-logging" name="commons-logging"
@@ -70,7 +74,7 @@
rev="${servlet-api-2.5.version}" conf="common->master"/>
<dependency org="commons-httpclient" name="commons-httpclient"
rev="${commons-httpclient.version}" conf="common->master"/>
- <dependency org="org.apache.hadoop" name="avro"
+ <dependency org="org.apache.avro" name="avro"
rev="${avro.version}" conf="common->default">
<exclude module="ant"/>
<exclude module="jetty"/>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/data_join/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/data_join/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/data_join/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/data_join/ivy.xml Wed Aug 17 22:08:08 2011
@@ -46,6 +46,10 @@
<dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
<dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
<dependency org="junit" name="junit" rev="${junit.version}" conf="common->default"/>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/dynamic-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/dynamic-scheduler/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/dynamic-scheduler/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/dynamic-scheduler/ivy.xml Wed Aug 17 22:08:08 2011
@@ -39,6 +39,10 @@
<dependencies>
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
<dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" conf="common->master"/>
<dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty-util.version}" conf="common->master"/>
<dependency org="tomcat" name="jasper-runtime" rev="${jasper.version}" conf="common->master"/>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/fairscheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/fairscheduler/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/fairscheduler/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/fairscheduler/ivy.xml Wed Aug 17 22:08:08 2011
@@ -49,6 +49,10 @@
rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-common.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
@@ -65,7 +69,7 @@
name="junit"
rev="${junit.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop"
+ <dependency org="org.apache.avro"
name="avro"
rev="${avro.version}"
conf="common->default">
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/gridmix/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/gridmix/ivy.xml Wed Aug 17 22:08:08 2011
@@ -56,7 +56,11 @@
name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}"
conf="test->default"/>
- <dependency org="commons-logging"
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
conf="common->default"/>
@@ -106,7 +110,7 @@
name="commons-cli"
rev="${commons-cli.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop"
+ <dependency org="org.apache.avro"
name="avro"
rev="${avro.version}"
conf="common->default">
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java Wed Aug 17 22:08:08 2011
@@ -32,7 +32,7 @@ import org.apache.hadoop.mapreduce.TaskT
import org.apache.hadoop.mapreduce.server.tasktracker.TTConfig;
import org.apache.hadoop.mapreduce.task.MapContextImpl;
import org.apache.hadoop.mapreduce.util.ResourceCalculatorPlugin;
-import org.apache.hadoop.mapreduce.util.ResourceCalculatorPlugin.ProcResourceValues;
+import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin.ProcResourceValues;
import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
import org.apache.hadoop.mapred.DummyResourceCalculatorPlugin;
import org.apache.hadoop.mapred.gridmix.LoadJob.ResourceUsageMatcherRunner;
@@ -610,4 +610,4 @@ public class TestResourceUsageEmulators
assertEquals("Emulation interval test for num calls failed " + info + "!",
expectedTotalNumCalls, fakeCore.getNumCalls(), 0L);
}
-}
\ No newline at end of file
+}
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/index/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/index/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/index/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/index/ivy.xml Wed Aug 17 22:08:08 2011
@@ -46,7 +46,11 @@
<dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}" conf="common->default"/>
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
<dependency org="org.apache.lucene" name="lucene-core" rev="${lucene-core.version}" conf="common->default"/>
<dependency org="junit" name="junit" rev="${junit.version}" conf="common->default"/>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/mumak/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/mumak/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/mumak/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/mumak/ivy.xml Wed Aug 17 22:08:08 2011
@@ -51,7 +51,11 @@
rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->default"/>
- <dependency org="commons-logging"
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
+<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
conf="common->default"/>
@@ -118,7 +122,7 @@
name="commons-cli"
rev="${commons-cli.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop"
+ <dependency org="org.apache.avro"
name="avro"
rev="${avro.version}"
conf="common->default">
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorJobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorJobTracker.java?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorJobTracker.java (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorJobTracker.java Wed Aug 17 22:08:08 2011
@@ -380,7 +380,6 @@ public class MockSimulatorJobTracker imp
throw new UnsupportedOperationException();
}
- @Override
public org.apache.hadoop.mapreduce.server.jobtracker.State getJobTrackerState()
throws IOException, InterruptedException {
throw new UnsupportedOperationException();
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/raid/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/raid/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/raid/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/raid/ivy.xml Wed Aug 17 22:08:08 2011
@@ -53,6 +53,11 @@
name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}"
conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
+
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
@@ -103,7 +108,7 @@
name="commons-cli"
rev="${commons-cli.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop"
+ <dependency org="org.apache.avro"
name="avro"
rev="${avro.version}"
conf="common->default">
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/streaming/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/streaming/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/streaming/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/streaming/ivy.xml Wed Aug 17 22:08:08 2011
@@ -49,6 +49,11 @@
rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
+
<dependency org="commons-cli" name="commons-cli"
rev="${commons-cli.version}" conf="common->default"/>
<dependency org="commons-logging" name="commons-logging"
@@ -69,7 +74,7 @@
rev="${commons-httpclient.version}" conf="common->default"/>
<dependency org="log4j" name="log4j"
rev="${log4j.version}" conf="common->master"/>
- <dependency org="org.apache.hadoop" name="avro"
+ <dependency org="org.apache.avro" name="avro"
rev="${avro.version}" conf="common->default">
<exclude module="ant"/>
<exclude module="jetty"/>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/vaidya/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/vaidya/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/vaidya/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/vaidya/ivy.xml Wed Aug 17 22:08:08 2011
@@ -45,6 +45,10 @@
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
<dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
<!-- Exclusions for transitive dependencies pulled in by log4j -->
<exclude org="com.sun.jdmk"/>
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/vertica/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/vertica/ivy.xml?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/vertica/ivy.xml (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/contrib/vertica/ivy.xml Wed Aug 17 22:08:08 2011
@@ -45,6 +45,11 @@
name="hadoop-common"
rev="${hadoop-common.version}"
conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ rev="${yarn.version}" conf="common->default"/>
+
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/java/org/apache/hadoop/mapred/TaskScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/java/org/apache/hadoop/mapred/TaskScheduler.java?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/java/org/apache/hadoop/mapred/TaskScheduler.java (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/java/org/apache/hadoop/mapred/TaskScheduler.java Wed Aug 17 22:08:08 2011
@@ -93,52 +93,6 @@ abstract class TaskScheduler implements
public abstract Collection<JobInProgress> getJobs(String queueName);
/**
- * Abstract QueueRefresher class. Scheduler's can extend this and return an
- * instance of this in the {@link #getQueueRefresher()} method. The
- * {@link #refreshQueues(List)} method of this instance will be invoked by the
- * {@link QueueManager} whenever it gets a request from an administrator to
- * refresh its own queue-configuration. This method has a documented contract
- * between the {@link QueueManager} and the {@link TaskScheduler}.
- *
- * Before calling QueueRefresher, the caller must hold the lock to the
- * corresponding {@link TaskScheduler} (generally in the {@link JobTracker}).
- */
- abstract class QueueRefresher {
-
- /**
- * Refresh the queue-configuration in the scheduler. This method has the
- * following contract.
- * <ol>
- * <li>Before this method, {@link QueueManager} does a validation of the new
- * queue-configuration. For e.g, currently addition of new queues, or
- * removal of queues at any level in the hierarchy is not supported by
- * {@link QueueManager} and so are not supported for schedulers too.</li>
- * <li>Schedulers will be passed a list of {@link JobQueueInfo}s of the root
- * queues i.e. the queues at the top level. All the descendants are properly
- * linked from these top-level queues.</li>
- * <li>Schedulers should use the scheduler specific queue properties from
- * the newRootQueues, validate the properties themselves and apply them
- * internally.</li>
- * <li>
- * Once the method returns successfully from the schedulers, it is assumed
- * that the refresh of queue properties is successful throughout and will be
- * 'committed' internally to {@link QueueManager} too. It is guaranteed that
- * at no point, after successful return from the scheduler, is the queue
- * refresh in QueueManager failed. If ever, such abnormalities happen, the
- * queue framework will be inconsistent and will need a JT restart.</li>
- * <li>If scheduler throws an exception during {@link #refreshQueues()},
- * {@link QueueManager} throws away the newly read configuration, retains
- * the old (consistent) configuration and informs the request issuer about
- * the error appropriately.</li>
- * </ol>
- *
- * @param newRootQueues
- */
- abstract void refreshQueues(List<JobQueueInfo> newRootQueues)
- throws Throwable;
- }
-
- /**
* Get the {@link QueueRefresher} for this scheduler. By default, no
* {@link QueueRefresher} exists for a scheduler and is set to null.
* Schedulers need to return an instance of {@link QueueRefresher} if they
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/java/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/java/org/apache/hadoop/mapred/TaskTracker.java Wed Aug 17 22:08:08 2011
@@ -2641,6 +2641,14 @@ public class TaskTracker
return taskStatus;
}
+ private TaskRunner createRunner(TaskTracker tracker, TaskInProgress task)
+ throws IOException {
+ if (task.getTask().isMapTask()) {
+ return new MapTaskRunner(task, tracker, task.getJobConf());
+ }
+ return new ReduceTaskRunner(task, tracker, task.getJobConf());
+ }
+
/**
* Kick off the task execution
*/
@@ -2652,7 +2660,7 @@ public class TaskTracker
if (this.taskStatus.getRunState() == TaskStatus.State.UNASSIGNED) {
this.taskStatus.setRunState(TaskStatus.State.RUNNING);
}
- setTaskRunner(task.createRunner(TaskTracker.this, this));
+ setTaskRunner(createRunner(TaskTracker.this, this));
this.runner.start();
this.taskStatus.setStartTime(System.currentTimeMillis());
} else {
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJvmManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJvmManager.java?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJvmManager.java (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJvmManager.java Wed Aug 17 22:08:08 2011
@@ -107,11 +107,11 @@ public class TestJvmManager {
// launch a jvm
JobConf taskConf = new JobConf(ttConf);
TaskAttemptID attemptID = new TaskAttemptID("test", 0, TaskType.MAP, 0, 0);
- Task task = new MapTask(null, attemptID, 0, null, 1);
+ MapTask task = new MapTask(null, attemptID, 0, null, 1);
task.setConf(taskConf);
TaskInProgress tip = tt.new TaskInProgress(task, taskConf);
File pidFile = new File(TEST_DIR, "pid");
- final TaskRunner taskRunner = task.createRunner(tt, tip);
+ final TaskRunner taskRunner = new MapTaskRunner(tip, tt, taskConf);
// launch a jvm which sleeps for 60 seconds
final Vector<String> vargs = new Vector<String>(2);
vargs.add(writeScript("SLEEP", "sleep 60\n", pidFile).getAbsolutePath());
@@ -174,7 +174,7 @@ public class TestJvmManager {
task = new MapTask(null, attemptID, 0, null, 1);
task.setConf(taskConf);
tip = tt.new TaskInProgress(task, taskConf);
- TaskRunner taskRunner2 = task.createRunner(tt, tip);
+ TaskRunner taskRunner2 = new MapTaskRunner(tip, tt, taskConf);
// build dummy vargs to call ls
Vector<String> vargs2 = new Vector<String>(1);
vargs2.add(writeScript("LS", "ls", pidFile).getAbsolutePath());
@@ -218,7 +218,7 @@ public class TestJvmManager {
task.setConf(taskConf);
TaskInProgress tip = tt.new TaskInProgress(task, taskConf);
File pidFile = new File(TEST_DIR, "pid_" + i);
- final TaskRunner taskRunner = task.createRunner(tt, tip);
+ final TaskRunner taskRunner = new MapTaskRunner(tip, tt, taskConf);
// launch a jvm which sleeps for 60 seconds
final Vector<String> vargs = new Vector<String>(2);
vargs.add(writeScript("script_" + i, "echo hi\n", pidFile).getAbsolutePath());
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java Wed Aug 17 22:08:08 2011
@@ -642,7 +642,7 @@ public class TestTaskTrackerLocalization
+ " is not created in any of the configured dirs!!",
attemptWorkDir != null);
- TaskRunner runner = task.createRunner(tracker, tip);
+ TaskRunner runner = new MapTaskRunner(tip, tracker, tip.getJobConf());
tip.setTaskRunner(runner);
// /////// Few more methods being tested
Modified: hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java?rev=1158935&r1=1158894&r2=1158935&view=diff
==============================================================================
--- hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java (original)
+++ hadoop/common/branches/MR-279-merge/hadoop-mapreduce/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java Wed Aug 17 22:08:08 2011
@@ -53,6 +53,7 @@ import org.apache.hadoop.hdfs.server.nam
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.Master;
import org.apache.hadoop.mapred.MiniMRCluster;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.MRJobConfig;
@@ -389,7 +390,7 @@ public class TestTokenCache {
conf.set(JTConfig.JT_USER_NAME, serviceName + SecurityUtil.HOSTNAME_PATTERN
+ domainName);
assertEquals("Failed to substitute HOSTNAME_PATTERN with hostName",
- serviceName + hostName + domainName, TokenCache.getJTPrincipal(conf));
+ serviceName + hostName + domainName, Master.getMasterPrincipal(conf));
}
@Test