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 sz...@apache.org on 2013/01/30 00:54:00 UTC
svn commit: r1440222 - in /hadoop/common/branches/HDFS-2802: ./ dev-support/
hadoop-maven-plugins/
hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/
hadoop-project-dist/ hadoop-tools/hadoop-rumen/src/main/java/org/apache/ha...
Author: szetszwo
Date: Tue Jan 29 23:53:59 2013
New Revision: 1440222
URL: http://svn.apache.org/viewvc?rev=1440222&view=rev
Log:
Merge r1438306 through r1440221 from trunk.
Modified:
hadoop/common/branches/HDFS-2802/ (props changed)
hadoop/common/branches/HDFS-2802/BUILDING.txt
hadoop/common/branches/HDFS-2802/dev-support/relnotes.py
hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/pom.xml
hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
hadoop/common/branches/HDFS-2802/hadoop-project-dist/pom.xml
hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java
hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java
hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java
hadoop/common/branches/HDFS-2802/pom.xml
Propchange: hadoop/common/branches/HDFS-2802/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1438306-1440221
Modified: hadoop/common/branches/HDFS-2802/BUILDING.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/BUILDING.txt?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/BUILDING.txt (original)
+++ hadoop/common/branches/HDFS-2802/BUILDING.txt Tue Jan 29 23:53:59 2013
@@ -6,7 +6,6 @@ Requirements:
* Unix System
* JDK 1.6
* Maven 3.0
-* Forrest 0.8 (if generating docs)
* Findbugs 1.3.9 (if running findbugs)
* ProtocolBuffer 2.4.1+ (for MapReduce and HDFS)
* CMake 2.6 or newer (if compiling native code)
Modified: hadoop/common/branches/HDFS-2802/dev-support/relnotes.py
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/dev-support/relnotes.py?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/dev-support/relnotes.py (original)
+++ hadoop/common/branches/HDFS-2802/dev-support/relnotes.py Tue Jan 29 23:53:59 2013
@@ -155,7 +155,7 @@ class JiraIter:
end=1
count=100
while (at < end):
- params = urllib.urlencode({'jql': "project in (HADOOP,HDFS,MAPREDUCE,YARN) and fixVersion in ('"+"' , '".join(versions)+"') and resolution = Fixed", 'startAt':at+1, 'maxResults':count})
+ params = urllib.urlencode({'jql': "project in (HADOOP,HDFS,MAPREDUCE,YARN) and fixVersion in ('"+"' , '".join(versions)+"') and resolution = Fixed", 'startAt':at, 'maxResults':count})
resp = urllib.urlopen("https://issues.apache.org/jira/rest/api/2/search?%s"%params)
data = json.loads(resp.read())
if (data.has_key('errorMessages')):
Modified: hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/pom.xml?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/pom.xml Tue Jan 29 23:53:59 2013
@@ -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/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java Tue Jan 29 23:53:59 2013
@@ -46,7 +46,7 @@ import java.util.TimeZone;
* build. The version information includes build time, SCM URI, SCM branch, SCM
* commit, and an MD5 checksum of the contents of the files in the codebase.
*/
-@Mojo(name="version-info", defaultPhase=LifecyclePhase.INITIALIZE)
+@Mojo(name="version-info")
public class VersionInfoMojo extends AbstractMojo {
@Parameter(defaultValue="${project}")
Modified: hadoop/common/branches/HDFS-2802/hadoop-project-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-project-dist/pom.xml?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-project-dist/pom.xml Tue Jan 29 23:53:59 2013
@@ -247,13 +247,6 @@
</copy>
<!-- Docs -->
- <exec dir="${project.build.directory}/docs-src"
- executable="${env.FORREST_HOME}/bin/forrest"
- failonerror="true">
- </exec>
- <copy todir="${project.build.directory}/site">
- <fileset dir="${project.build.directory}/docs-src/build/site"/>
- </copy>
<copy file="${project.build.directory}/docs-src/releasenotes.html"
todir="${project.build.directory}/site"/>
<style basedir="${basedir}/src/main/resources"
Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java Tue Jan 29 23:53:59 2013
@@ -67,6 +67,11 @@ public class Hadoop20JHParser implements
reader = new LineReader(input);
}
+ public Hadoop20JHParser(LineReader reader) throws IOException {
+ super();
+ this.reader = reader;
+ }
+
Map<String, HistoryEventEmitter> liveEmitters =
new HashMap<String, HistoryEventEmitter>();
Queue<HistoryEvent> remainingEvents = new LinkedList<HistoryEvent>();
Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java Tue Jan 29 23:53:59 2013
@@ -76,6 +76,23 @@ public class Job20LineHistoryEventEmitte
}
String jobName = line.get("JOBNAME");
String jobQueueName = line.get("JOB_QUEUE");// could be null
+ String workflowId = line.get("WORKFLOW_ID");
+ if (workflowId == null) {
+ workflowId = "";
+ }
+ String workflowName = line.get("WORKFLOW_NAME");
+ if (workflowName == null) {
+ workflowName = "";
+ }
+ String workflowNodeName = line.get("WORKFLOW_NODE_NAME");
+ if (workflowNodeName == null) {
+ workflowNodeName = "";
+ }
+ String workflowAdjacencies = line.get("WORKFLOW_ADJACENCIES");
+ if (workflowAdjacencies == null) {
+ workflowAdjacencies = "";
+ }
+
if (submitTime != null) {
Job20LineHistoryEventEmitter that =
@@ -86,7 +103,8 @@ public class Job20LineHistoryEventEmitte
Map<JobACL, AccessControlList> jobACLs =
new HashMap<JobACL, AccessControlList>();
return new JobSubmittedEvent(jobID, jobName, user,
- that.originalSubmitTime, jobConf, jobACLs, jobQueueName);
+ that.originalSubmitTime, jobConf, jobACLs, jobQueueName,
+ workflowId, workflowName, workflowNodeName, workflowAdjacencies);
}
return null;
Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java Tue Jan 29 23:53:59 2013
@@ -65,6 +65,14 @@ public abstract class TaskAttempt20LineE
String taskType = line.get("TASK_TYPE");
String trackerName = line.get("TRACKER_NAME");
String httpPort = line.get("HTTP_PORT");
+ String locality = line.get("LOCALITY");
+ if (locality == null) {
+ locality = "";
+ }
+ String avataar = line.get("AVATAAR");
+ if (avataar == null) {
+ avataar = "";
+ }
if (startTime != null && taskType != null) {
TaskAttempt20LineEventEmitter that =
@@ -79,7 +87,8 @@ public abstract class TaskAttempt20LineE
.parseInt(httpPort);
return new TaskAttemptStartedEvent(taskAttemptID,
- that.originalTaskType, that.originalStartTime, trackerName, port, -1);
+ that.originalTaskType, that.originalStartTime, trackerName, port, -1,
+ locality, avataar);
}
return null;
Modified: hadoop/common/branches/HDFS-2802/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/pom.xml?rev=1440222&r1=1440221&r2=1440222&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/pom.xml Tue Jan 29 23:53:59 2013
@@ -517,6 +517,18 @@ xsi:schemaLocation="http://maven.apache.
<properties>
<cloverLicenseLocation>${user.home}/.clover.license</cloverLicenseLocation>
<cloverDatabase>${project.build.directory}/clover/hadoop-coverage.db</cloverDatabase>
+ <!-- NB: This additional parametrization is made in order
+ to be able to re-define these properties with "-Dk=v" maven options.
+ By some reason the expressions declared in clover
+ docs like "${maven.clover.generateHtml}" do not work in that way.
+ However, the below properties are confirmed to work: e.g.
+ -DcloverGenHtml=false switches off the Html generation.
+ The default values provided here exactly correspond to Clover defaults, so
+ the behavior is 100% backwards compatible. -->
+ <cloverAlwaysReport>true</cloverAlwaysReport>
+ <cloverGenHtml>true</cloverGenHtml>
+ <cloverGenXml>true</cloverGenXml>
+ <cloverGenHistorical>false</cloverGenHistorical>
</properties>
<build>
<plugins>
@@ -530,8 +542,10 @@ xsi:schemaLocation="http://maven.apache.
<cloverDatabase>${cloverDatabase}</cloverDatabase>
<targetPercentage>50%</targetPercentage>
<outputDirectory>${project.build.directory}/clover</outputDirectory>
- <generateHtml>true</generateHtml>
- <generateXml>true</generateXml>
+ <alwaysReport>${cloverAlwaysReport}</alwaysReport>
+ <generateHtml>${cloverGenHtml}</generateHtml>
+ <generateXml>${cloverGenXml}</generateXml>
+ <generateHistorical>${cloverGenHistorical}</generateHistorical>
</configuration>
<executions>
<execution>