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 vi...@apache.org on 2013/08/12 23:26:01 UTC
svn commit: r1513258 - in /hadoop/common/branches/YARN-321: ./
hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-maven-plugins/
hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ hadoop-tools/
hadoop-tools/hadoop-archives/ hadoop-tools/hadoop...
Author: vinodkv
Date: Mon Aug 12 21:25:49 2013
New Revision: 1513258
URL: http://svn.apache.org/r1513258
Log:
Forwarding YARN-321 branch to latest branch-2.
Modified:
hadoop/common/branches/YARN-321/ (props changed)
hadoop/common/branches/YARN-321/.gitattributes
hadoop/common/branches/YARN-321/hadoop-assemblies/pom.xml
hadoop/common/branches/YARN-321/hadoop-client/pom.xml
hadoop/common/branches/YARN-321/hadoop-dist/pom.xml
hadoop/common/branches/YARN-321/hadoop-maven-plugins/pom.xml
hadoop/common/branches/YARN-321/hadoop-minicluster/pom.xml
hadoop/common/branches/YARN-321/hadoop-project/ (props changed)
hadoop/common/branches/YARN-321/hadoop-project-dist/pom.xml
hadoop/common/branches/YARN-321/hadoop-project/pom.xml (contents, props changed)
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-archives/pom.xml
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/pom.xml
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-gridmix/pom.xml
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-rumen/pom.xml
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-streaming/pom.xml
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html (props changed)
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html (props changed)
hadoop/common/branches/YARN-321/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/YARN-321/hadoop-tools/pom.xml
hadoop/common/branches/YARN-321/pom.xml
Propchange: hadoop/common/branches/YARN-321/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2:r1503799-1513205
Merged /hadoop/common/trunk:r1380921,1507259
Modified: hadoop/common/branches/YARN-321/.gitattributes
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/.gitattributes?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/.gitattributes (original)
+++ hadoop/common/branches/YARN-321/.gitattributes Mon Aug 12 21:25:49 2013
@@ -14,5 +14,6 @@
*.sh text eol=lf
*.bat text eol=crlf
+*.cmd text eol=crlf
*.csproj text merge=union eol=crlf
*.sln text merge=union eol=crlf
Modified: hadoop/common/branches/YARN-321/hadoop-assemblies/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-assemblies/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-assemblies/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-assemblies/pom.xml Mon Aug 12 21:25:49 2013
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-assemblies</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>Apache Hadoop Assemblies</name>
<description>Apache Hadoop Assemblies</description>
Modified: hadoop/common/branches/YARN-321/hadoop-client/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-client/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-client/pom.xml Mon Aug 12 21:25:49 2013
@@ -18,12 +18,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project-dist</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../hadoop-project-dist</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<description>Apache Hadoop Client</description>
Modified: hadoop/common/branches/YARN-321/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-dist/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-dist/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-dist</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Distribution</description>
<name>Apache Hadoop Distribution</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/YARN-321/hadoop-maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-maven-plugins/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-maven-plugins/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-maven-plugins/pom.xml Mon Aug 12 21:25:49 2013
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
@@ -71,6 +71,17 @@
</execution>
</executions>
</plugin>
+ <!--
+ Skip Clover instrumentation for this module to prevent error finding Clover
+ classes during plugin execution when running a build with Clover enabled.
+ -->
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: hadoop/common/branches/YARN-321/hadoop-minicluster/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-minicluster/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-minicluster/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-minicluster/pom.xml Mon Aug 12 21:25:49 2013
@@ -18,12 +18,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<description>Apache Hadoop Mini-Cluster</description>
Propchange: hadoop/common/branches/YARN-321/hadoop-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-project:r1503799-1513205
Modified: hadoop/common/branches/YARN-321/hadoop-project-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-project-dist/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-project-dist/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project-dist</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Project Dist POM</description>
<name>Apache Hadoop Project Dist POM</name>
<packaging>pom</packaging>
@@ -40,6 +40,7 @@
<hadoop.component>UNDEF</hadoop.component>
<bundle.snappy>false</bundle.snappy>
+ <bundle.snappy.in.bin>false</bundle.snappy.in.bin>
</properties>
<dependencies>
@@ -355,6 +356,12 @@
mkdir -p $${TARGET_BIN_DIR}
cd $${BIN_DIR}
$$TAR * | (cd $${TARGET_BIN_DIR}/; $$UNTAR)
+ if [ "${bundle.snappy.in.bin}" = "true" ] ; then
+ if [ "${bundle.snappy}" = "true" ] ; then
+ cd ${snappy.lib}
+ $$TAR *snappy* | (cd $${TARGET_BIN_DIR}/; $$UNTAR)
+ fi
+ fi
fi
</echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true">
Modified: hadoop/common/branches/YARN-321/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-project/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-project/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,11 +20,11 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-main</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Project POM</description>
<name>Apache Hadoop Project POM</name>
<packaging>pom</packaging>
@@ -57,6 +57,7 @@
<!-- Used for building path to native library loaded by tests. Projects -->
<!-- at different nesting levels in the source tree may need to override. -->
<hadoop.common.build.dir>${basedir}/../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
+ <java.security.egd>file:///dev/urandom</java.security.egd>
</properties>
<dependencyManagement>
@@ -547,12 +548,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
@@ -592,7 +593,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.5.3</version>
+ <version>1.7.4</version>
</dependency>
<dependency>
<groupId>net.sf.kosmosfs</groupId>
@@ -868,7 +869,7 @@
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
<java.security.krb5.conf>${basedir}/src/test/resources/krb5.conf</java.security.krb5.conf>
- <java.security.egd>file:///dev/urandom</java.security.egd>
+ <java.security.egd>${java.security.egd}</java.security.egd>
<require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop>
</systemPropertyVariables>
<includes>
@@ -922,6 +923,14 @@
<family>Windows</family>
</os>
</activation>
+ <properties>
+ <!-- We must use this exact string for egd on Windows, because the -->
+ <!-- JVM will check for an exact string match on this. If found, it -->
+ <!-- will use a native entropy provider. This will not really -->
+ <!-- attempt to open a file at this path. -->
+ <java.security.egd>file:/dev/urandom</java.security.egd>
+ <bundle.snappy.in.bin>true</bundle.snappy.in.bin>
+ </properties>
<build>
<plugins>
<plugin>
@@ -930,7 +939,7 @@
<configuration>
<environmentVariables>
<!-- Specify where to look for the native DLL on Windows -->
- <PATH>${env.PATH};${hadoop.common.build.dir}/bin</PATH>
+ <PATH>${env.PATH};${hadoop.common.build.dir}/bin;${snappy.lib}</PATH>
</environmentVariables>
</configuration>
</plugin>
Propchange: hadoop/common/branches/YARN-321/hadoop-project/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 12 21:25:49 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml:1227776-1294021
+/hadoop/common/branches/branch-2/hadoop-project/pom.xml:1503799-1513205
+/hadoop/common/trunk/hadoop-project/pom.xml:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239386,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1
301308,1301312,1301820,1301871,1302624,1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1333557,1334216,1342112,1348207,1349616,1351445,1351818,1361813,1373683,1374696,1375829,1430682,1430688,1440245,1476395,1477849,1480838,1480840,1487093,1512026
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-archives/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-archives/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-archives/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-archives/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-archives</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Archives</description>
<name>Apache Hadoop Archives</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-datajoin/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-datajoin/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-datajoin/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-datajoin/pom.xml Mon Aug 12 21:25:49 2013
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-datajoin</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Data Join</description>
<name>Apache Hadoop Data Join</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Distributed Copy</description>
<name>Apache Hadoop Distributed Copy</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java Mon Aug 12 21:25:49 2013
@@ -169,6 +169,7 @@ public class TestCopyCommitter {
Assert.fail("Preserve status failure");
} finally {
TestDistCpUtils.delete(fs, "/tmp1");
+ conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-extras</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Extras</description>
<name>Apache Hadoop Extras</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java Mon Aug 12 21:25:49 2013
@@ -24,8 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
-import javax.security.auth.login.LoginException;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -47,10 +45,7 @@ import org.apache.hadoop.mapred.OutputCo
import org.apache.hadoop.mapred.RecordReader;
import org.apache.hadoop.mapred.Reporter;
import org.apache.hadoop.mapred.SequenceFileRecordReader;
-import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.JobSubmissionFiles;
-import org.apache.hadoop.mapreduce.jobhistory.JobSubmittedEvent;
-import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.ToolRunner;
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java Mon Aug 12 21:25:49 2013
@@ -113,6 +113,8 @@ public class TestDistCh extends junit.fr
}
static class ChPermissionStatus extends PermissionStatus {
+ private final boolean defaultPerm;
+
ChPermissionStatus(FileStatus filestatus) {
this(filestatus, "", "", "");
}
@@ -121,6 +123,7 @@ public class TestDistCh extends junit.fr
super("".equals(owner)? filestatus.getOwner(): owner,
"".equals(group)? filestatus.getGroup(): group,
"".equals(permission)? filestatus.getPermission(): new FsPermission(Short.parseShort(permission, 8)));
+ defaultPerm = permission == null || "".equals(permission);
}
}
@@ -141,7 +144,7 @@ public class TestDistCh extends junit.fr
runLsr(shell, tree.root, 0);
final String[] args = new String[NUN_SUBS];
- final PermissionStatus[] newstatus = new PermissionStatus[NUN_SUBS];
+ final ChPermissionStatus[] newstatus = new ChPermissionStatus[NUN_SUBS];
args[0]="/test/testDistCh/sub0:sub1::";
@@ -185,13 +188,11 @@ public class TestDistCh extends junit.fr
}
}
-
-
- static void checkFileStatus(PermissionStatus expected, FileStatus actual) {
+ static void checkFileStatus(ChPermissionStatus expected, FileStatus actual) {
assertEquals(expected.getUserName(), actual.getOwner());
assertEquals(expected.getGroupName(), actual.getGroup());
- FsPermission perm = expected.getPermission();
- if (actual.isFile()) {
+ FsPermission perm = expected.getPermission();
+ if (actual.isFile() && expected.defaultPerm) {
perm = perm.applyUMask(UMASK);
}
assertEquals(perm, actual.getPermission());
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-gridmix/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-gridmix/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-gridmix/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-gridmix/pom.xml Mon Aug 12 21:25:49 2013
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-gridmix</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Gridmix</description>
<name>Apache Hadoop Gridmix</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-pipes/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-pipes/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-pipes/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-pipes/pom.xml Mon Aug 12 21:25:49 2013
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-pipes</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Pipes</description>
<name>Apache Hadoop Pipes</name>
<packaging>pom</packaging>
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-rumen/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-rumen/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-rumen/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-rumen/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-rumen</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Rumen</description>
<name>Apache Hadoop Rumen</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-streaming/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-streaming/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-streaming/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-streaming/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-streaming</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop MapReduce Streaming</description>
<name>Apache Hadoop MapReduce Streaming</name>
<packaging>jar</packaging>
Propchange: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-tools-dist/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project-dist</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../hadoop-project-dist</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-tools-dist</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Tools Dist</description>
<name>Apache Hadoop Tools Dist</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/YARN-321/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-tools/pom.xml Mon Aug 12 21:25:49 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-tools</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Tools</description>
<name>Apache Hadoop Tools</name>
<packaging>pom</packaging>
Modified: hadoop/common/branches/YARN-321/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/pom.xml?rev=1513258&r1=1513257&r2=1513258&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/pom.xml (original)
+++ hadoop/common/branches/YARN-321/pom.xml Mon Aug 12 21:25:49 2013
@@ -18,7 +18,7 @@ xsi:schemaLocation="http://maven.apache.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-main</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache Hadoop Main</description>
<name>Apache Hadoop Main</name>
<packaging>pom</packaging>