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 ar...@apache.org on 2013/10/16 23:07:35 UTC
svn commit: r1532910 - in /hadoop/common/branches/HDFS-2832: ./
hadoop-project/ hadoop-project/src/site/
hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/
hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanag...
Author: arp
Date: Wed Oct 16 21:07:28 2013
New Revision: 1532910
URL: http://svn.apache.org/r1532910
Log:
Merging r1527684 through r1532876 from trunk to branch HDFS-2832
Removed:
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler-allocation.xml
Modified:
hadoop/common/branches/HDFS-2832/ (props changed)
hadoop/common/branches/HDFS-2832/.gitattributes
hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml
hadoop/common/branches/HDFS-2832/hadoop-project/src/site/site.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd (props changed)
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd (props changed)
hadoop/common/branches/HDFS-2832/pom.xml
Propchange: hadoop/common/branches/HDFS-2832/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1527684-1532876
Modified: hadoop/common/branches/HDFS-2832/.gitattributes
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/.gitattributes?rev=1532910&r1=1532909&r2=1532910&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/.gitattributes (original)
+++ hadoop/common/branches/HDFS-2832/.gitattributes Wed Oct 16 21:07:28 2013
@@ -15,5 +15,6 @@
*.bat text eol=crlf
*.cmd text eol=crlf
+*.vcxproj text merge=union eol=crlf
*.csproj text merge=union eol=crlf
*.sln text merge=union eol=crlf
Modified: hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml?rev=1532910&r1=1532909&r2=1532910&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml Wed Oct 16 21:07:28 2013
@@ -685,7 +685,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.2</version>
+ <version>3.4.5</version>
<exclusions>
<exclusion>
<!-- otherwise seems to drag in junit 3.8.1 via jline -->
@@ -709,7 +709,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.2</version>
+ <version>3.4.5</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
Modified: hadoop/common/branches/HDFS-2832/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-project/src/site/site.xml?rev=1532910&r1=1532909&r2=1532910&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-project/src/site/site.xml Wed Oct 16 21:07:28 2013
@@ -86,6 +86,7 @@
<item name="Compatibilty between Hadoop 1.x and Hadoop 2.x" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduce_Compatibility_Hadoop1_Hadoop2.html"/>
<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"/>
</menu>
<menu name="YARN" inherit="top">
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1532910&r1=1532909&r2=1532910&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java Wed Oct 16 21:07:28 2013
@@ -332,6 +332,7 @@ public class TestCopyCommitter {
} finally {
TestDistCpUtils.delete(fs, workPath);
TestDistCpUtils.delete(fs, finalPath);
+ conf.setBoolean(DistCpConstants.CONF_LABEL_ATOMIC_COPY, false);
}
}
@@ -373,6 +374,7 @@ public class TestCopyCommitter {
} finally {
TestDistCpUtils.delete(fs, workPath);
TestDistCpUtils.delete(fs, finalPath);
+ conf.setBoolean(DistCpConstants.CONF_LABEL_ATOMIC_COPY, false);
}
}
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java?rev=1532910&r1=1532909&r2=1532910&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java Wed Oct 16 21:07:28 2013
@@ -147,6 +147,12 @@ public class NodeInfo {
list2));
return list;
}
+
+ @Override
+ public String getNodeManagerVersion() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
public static RMNode newNodeInfo(String rackName, String hostName,
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java?rev=1532910&r1=1532909&r2=1532910&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java Wed Oct 16 21:07:28 2013
@@ -138,4 +138,10 @@ public class RMNodeWrapper implements RM
return updates;
}
+@Override
+public String getNodeManagerVersion() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
}
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml?rev=1532910&r1=1532909&r2=1532910&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml Wed Oct 16 21:07:28 2013
@@ -20,28 +20,31 @@
The documentation also includes a sample config file.
-->
-<configuration>
- <property>
- <description>Absolute path to allocation file. An allocation file is an XML
- manifest describing queues and their properties, in addition to certain
- policy defaults. This file must be in XML format as described in
- http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/FairScheduler.html.
- </description>
- <name>yarn.scheduler.fair.allocation.file</name>
- <value>src/test/resources/fair-scheduler-allocation.xml</value>
- </property>
-
- <property>
- <description>Whether to use preemption. Note that preemption is experimental
- in the current version. Defaults to false.</description>
- <name>yarn.scheduler.fair.preemption</name>
- <value>true</value>
- </property>
-
- <property>
- <description>Whether to allow multiple container assignments in one
- heartbeat. Defaults to false.</description>
- <name>yarn.scheduler.fair.assignmultiple</name>
- <value>true</value>
- </property>
-</configuration>
+<allocations>
+ <user name="jenkins">
+ <!-- Limit on running jobs for the user across all pools. If more
+ jobs than this are submitted, only the first <maxRunningJobs> will
+ be scheduled at any given time. Defaults to infinity or the
+ userMaxJobsDefault value set below. -->
+ <maxRunningJobs>1000</maxRunningJobs>
+ </user>
+ <userMaxAppsDefault>1000</userMaxAppsDefault>
+ <queue name="sls_queue_1">
+ <minResources>1024 mb, 1 vcores</minResources>
+ <schedulingMode>fair</schedulingMode>
+ <weight>0.25</weight>
+ <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+ </queue>
+ <queue name="sls_queue_2">
+ <minResources>1024 mb, 1 vcores</minResources>
+ <schedulingMode>fair</schedulingMode>
+ <weight>0.25</weight>
+ <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+ </queue>
+ <queue name="sls_queue_3">
+ <minResources>1024 mb, 1 vcores</minResources>
+ <weight>0.5</weight>
+ <schedulingMode>fair</schedulingMode>
+ <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+ </queue>
+</allocations>
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml?rev=1532910&r1=1532909&r2=1532910&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml Wed Oct 16 21:07:28 2013
@@ -55,4 +55,17 @@
<value>false</value>
</property>
+ <property>
+ <description>Whether to use preemption. Note that preemption is experimental
+ in the current version. Defaults to false.</description>
+ <name>yarn.scheduler.fair.preemption</name>
+ <value>true</value>
+ </property>
+
+ <property>
+ <description>Whether to allow multiple container assignments in one
+ heartbeat. Defaults to false.</description>
+ <name>yarn.scheduler.fair.assignmultiple</name>
+ <value>true</value>
+ </property>
</configuration>
Propchange: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/common/branches/HDFS-2832/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/pom.xml?rev=1532910&r1=1532909&r2=1532910&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/pom.xml (original)
+++ hadoop/common/branches/HDFS-2832/pom.xml Wed Oct 16 21:07:28 2013
@@ -556,6 +556,19 @@ xsi:schemaLocation="http://maven.apache.
<generateHtml>${cloverGenHtml}</generateHtml>
<generateXml>${cloverGenXml}</generateXml>
<generateHistorical>${cloverGenHistorical}</generateHistorical>
+ <excludes>
+ <exclude>**/examples/**/*.java</exclude>
+ <exclude>**/hamlet/*.java</exclude>
+ <exclude>**/ha/proto/*.java</exclude>
+ <exclude>**/protocol/proto/*.java</exclude>
+ <exclude>**/compiler/generated/*.java</exclude>
+ <exclude>**/protobuf/*.java</exclude>
+ <exclude>**/v2/proto/*.java</exclude>
+ <exclude>**/yarn/proto/*.java</exclude>
+ <exclude>**/security/proto/*.java</exclude>
+ <exclude>**/tools/proto/*.java</exclude>
+ <exclude>**/hs/proto/*.java</exclude>
+ </excludes>
</configuration>
<executions>
<execution>