hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1537252 - in /hadoop/common/branches/HDFS-2832: ./ hadoop-project/src/site/ hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/ hadoop-tools/hadoop-sls/src/main/sample-conf/
Date Wed, 30 Oct 2013 19:28:46 GMT
Author: arp
Date: Wed Oct 30 19:28:44 2013
New Revision: 1537252

URL: http://svn.apache.org/r1537252
Log:
Merging r1536890 through r1537251 from trunk to branch HDFS-2832

Removed:
    hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler-allocation.xml
Modified:
    hadoop/common/branches/HDFS-2832/   (props changed)
    hadoop/common/branches/HDFS-2832/hadoop-project/src/site/site.xml
    hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCpV1.java
    hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
    hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
    hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml

Propchange: hadoop/common/branches/HDFS-2832/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1536890-1537251

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=1537252&r1=1537251&r2=1537252&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 30 19:28:44
2013
@@ -80,6 +80,7 @@
       <item name="HttpFS Gateway" href="hadoop-hdfs-httpfs/index.html"/>
       <item name="Short Circuit Local Reads" 
           href="hadoop-project-dist/hadoop-hdfs/ShortCircuitLocalReads.html"/>
+      <item name="Centralized Cache Management" href="hadoop-project-dist/hadoop-hdfs/CentralizedCacheManagement.html"/>
       <item name="HDFS NFS Gateway" href="hadoop-project-dist/hadoop-hdfs/HdfsNfsGateway.html"/>
     </menu>
 

Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCpV1.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCpV1.java?rev=1537252&r1=1537251&r2=1537252&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCpV1.java
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCpV1.java
Wed Oct 30 19:28:44 2013
@@ -46,7 +46,6 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.Trash;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.hdfs.HftpFileSystem;
 import org.apache.hadoop.hdfs.protocol.QuotaExceededException;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.NullWritable;

Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml?rev=1537252&r1=1537251&r2=1537252&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
Wed Oct 30 19:28:44 2013
@@ -57,11 +57,4 @@
     <name>yarn.scheduler.capacity.root.sls_queue_3.maximum-capacity</name>
     <value>100</value>
   </property>
-  
-  <property>
-    <name>yarn.scheduler.capacity.maximum-applications</name>
-    <value>1000</value>
-    <description>Maximum number of applications in the system which 
-    can be concurrently active both running and pending</description>
-  </property>
 </configuration>

Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml?rev=1537252&r1=1537251&r2=1537252&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
Wed Oct 30 19:28:44 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>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/main/sample-conf/yarn-site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml?rev=1537252&r1=1537251&r2=1537252&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml
Wed Oct 30 19:28:44 2013
@@ -57,4 +57,24 @@
     <value>false</value>
   </property>
 
+  <property>
+    <name>yarn.scheduler.capacity.maximum-applications</name>
+    <value>1000</value>
+    <description>Maximum number of applications in the system which
+      can be concurrently active both running and pending</description>
+  </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>



Mime
View raw message