Author: wang
Date: Mon Apr 28 19:40:06 2014
New Revision: 1590766
URL: http://svn.apache.org/r1590766
Log:
Merge changes from trunk
Removed:
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/src/site/fml/
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/src/site/pdf.xml
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/src/site/xdoc/
Modified:
hadoop/common/branches/HDFS-2006/ (props changed)
hadoop/common/branches/HDFS-2006/hadoop-maven-plugins/pom.xml
hadoop/common/branches/HDFS-2006/hadoop-project/pom.xml
hadoop/common/branches/HDFS-2006/hadoop-project/src/site/site.xml
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/io/TestKeyOnlyTextOutputReader.java
Propchange: hadoop/common/branches/HDFS-2006/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1588992-1590763
Modified: hadoop/common/branches/HDFS-2006/hadoop-maven-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-maven-plugins/pom.xml?rev=1590766&r1=1590765&r2=1590766&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2006/hadoop-maven-plugins/pom.xml (original)
+++ hadoop/common/branches/HDFS-2006/hadoop-maven-plugins/pom.xml Mon Apr 28
19:40:06 2014
@@ -49,7 +49,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: hadoop/common/branches/HDFS-2006/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-project/pom.xml?rev=1590766&r1=1590765&r2=1590766&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2006/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-2006/hadoop-project/pom.xml Mon Apr 28 19:40:06
2014
@@ -591,7 +591,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: hadoop/common/branches/HDFS-2006/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-project/src/site/site.xml?rev=1590766&r1=1590765&r2=1590766&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2006/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-2006/hadoop-project/src/site/site.xml Mon Apr
28 19:40:06 2014
@@ -92,6 +92,7 @@
<item name="Encrypted Shuffle"
href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html"/>
<item name="Pluggable Shuffle/Sort"
href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/PluggableShuffleAndPluggableSort.html"/>
<item name="Distributed Cache Deploy"
href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/DistributedCacheDeploy.html"/>
+ <item name="DistCp"
href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/DistCp.html"/>
</menu>
<menu name="YARN" inherit="top">
Modified: hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/pom.xml?rev=1590766&r1=1590765&r2=1590766&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/pom.xml
(original)
+++ hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/pom.xml Mon Apr
28 19:40:06 2014
@@ -192,21 +192,6 @@
</execution>
</executions>
</plugin>
- <!-- Disable generation of pdf using maven-pdf-plugin until v.1.2 is
released.
- See Hadoop 8064 for details. -->
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pdf-plugin</artifactId>
- <executions>
- <execution>
- <id>pdf</id>
- <phase>package</phase>
- <goals>
- <goal>pdf</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
</plugins>
</build>
</project>
Modified:
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java?rev=1590766&r1=1590765&r2=1590766&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java
(original)
+++
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java
Mon Apr 28 19:40:06 2014
@@ -18,7 +18,7 @@
package org.apache.hadoop.tools.mapred.lib;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
Modified:
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java?rev=1590766&r1=1590765&r2=1590766&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
(original)
+++
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
Mon Apr 28 19:40:06 2014
@@ -38,6 +38,7 @@ import org.apache.hadoop.mapreduce.jobhi
import org.apache.hadoop.mapreduce.jobhistory.JobPriorityChangeEvent;
import org.apache.hadoop.mapreduce.jobhistory.JobStatusChangedEvent;
import org.apache.hadoop.mapreduce.jobhistory.JobSubmittedEvent;
+import org.apache.hadoop.mapreduce.jobhistory.JobQueueChangeEvent;
import org.apache.hadoop.mapreduce.jobhistory.JobUnsuccessfulCompletionEvent;
import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinished;
import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinishedEvent;
@@ -144,6 +145,8 @@ public class JobBuilder {
processJobInitedEvent((JobInitedEvent) event);
} else if (event instanceof JobPriorityChangeEvent) {
processJobPriorityChangeEvent((JobPriorityChangeEvent) event);
+ } else if (event instanceof JobQueueChangeEvent) {
+ processJobQueueChangeEvent((JobQueueChangeEvent) event);
} else if (event instanceof JobStatusChangedEvent) {
processJobStatusChangedEvent((JobStatusChangedEvent) event);
} else if (event instanceof JobSubmittedEvent) {
@@ -611,6 +614,14 @@ public class JobBuilder {
}
}
+ private void processJobQueueChangeEvent(JobQueueChangeEvent event) {
+ // set the queue name if existing
+ String queue = event.getJobQueueName();
+ if (queue != null) {
+ result.setQueue(queue);
+ }
+ }
+
private void processJobStatusChangedEvent(JobStatusChangedEvent event) {
result.setOutcome(Pre21JobHistoryConstants.Values
.valueOf(event.getStatus()));
Modified:
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java?rev=1590766&r1=1590765&r2=1590766&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
(original)
+++
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
Mon Apr 28 19:40:06 2014
@@ -18,7 +18,7 @@
package org.apache.hadoop.yarn.sls.utils;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
public class TestSLSUtils {
Modified:
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java?rev=1590766&r1=1590765&r2=1590766&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
(original)
+++
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
Mon Apr 28 19:40:06 2014
@@ -18,7 +18,7 @@
package org.apache.hadoop.yarn.sls.web;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.yarn.sls.SLSRunner;
import org.junit.Test;
Modified:
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/io/TestKeyOnlyTextOutputReader.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/io/TestKeyOnlyTextOutputReader.java?rev=1590766&r1=1590765&r2=1590766&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/io/TestKeyOnlyTextOutputReader.java
(original)
+++
hadoop/common/branches/HDFS-2006/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/io/TestKeyOnlyTextOutputReader.java
Mon Apr 28 19:40:06 2014
@@ -23,7 +23,7 @@ import java.io.DataInput;
import java.io.DataInputStream;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
