You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by at...@apache.org on 2011/11/28 19:21:56 UTC
svn commit: r1207490 [2/2] - in
/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project: ./ conf/
hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/
hadoop-mapreduce-client/hadoop-mapreduce-c...
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java Mon Nov 28 18:21:46 2011
@@ -45,7 +45,7 @@ public class HadoopYarnRPC extends YarnR
@Override
public Object getProxy(Class protocol, InetSocketAddress addr,
Configuration conf) {
- LOG.info("Creating a HadoopYarnRpc proxy for protocol " + protocol);
+ LOG.debug("Creating a HadoopYarnRpc proxy for protocol " + protocol);
RPC.setProtocolEngine(conf, protocol, AvroSpecificRpcEngine.class);
try {
return RPC.getProxy(protocol, 1, addr, conf);
@@ -64,7 +64,7 @@ public class HadoopYarnRPC extends YarnR
InetSocketAddress addr, Configuration conf,
SecretManager<? extends TokenIdentifier> secretManager,
int numHandlers) {
- LOG.info("Creating a HadoopYarnRpc server for protocol " + protocol +
+ LOG.debug("Creating a HadoopYarnRpc server for protocol " + protocol +
" with " + numHandlers + " handlers");
RPC.setProtocolEngine(conf, protocol, AvroSpecificRpcEngine.class);
final RPC.Server hadoopServer;
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java Mon Nov 28 18:21:46 2011
@@ -46,7 +46,8 @@ public abstract class YarnRPC {
int numHandlers);
public static YarnRPC create(Configuration conf) {
- LOG.info("Creating YarnRPC for " + conf.get(YarnConfiguration.IPC_RPC_IMPL));
+ LOG.debug("Creating YarnRPC for " +
+ conf.get(YarnConfiguration.IPC_RPC_IMPL));
String clazzName = conf.get(YarnConfiguration.IPC_RPC_IMPL);
if (clazzName == null) {
clazzName = YarnConfiguration.DEFAULT_IPC_RPC_IMPL;
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ApplicationTokenSelector.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ApplicationTokenSelector.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ApplicationTokenSelector.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ApplicationTokenSelector.java Mon Nov 28 18:21:46 2011
@@ -39,9 +39,9 @@ public class ApplicationTokenSelector im
if (service == null) {
return null;
}
- LOG.info("Looking for a token with service " + service.toString());
+ LOG.debug("Looking for a token with service " + service.toString());
for (Token<? extends TokenIdentifier> token : tokens) {
- LOG.info("Token kind is " + token.getKind().toString()
+ LOG.debug("Token kind is " + token.getKind().toString()
+ " and the token's service name is " + token.getService());
if (ApplicationTokenIdentifier.KIND_NAME.equals(token.getKind())
&& service.equals(token.getService())) {
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientTokenSelector.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientTokenSelector.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientTokenSelector.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientTokenSelector.java Mon Nov 28 18:21:46 2011
@@ -39,9 +39,9 @@ public class ClientTokenSelector impleme
if (service == null) {
return null;
}
- LOG.info("Looking for a token with service " + service.toString());
+ LOG.debug("Looking for a token with service " + service.toString());
for (Token<? extends TokenIdentifier> token : tokens) {
- LOG.info("Token kind is " + token.getKind().toString()
+ LOG.debug("Token kind is " + token.getKind().toString()
+ " and the token's service name is " + token.getService());
if (ClientTokenIdentifier.KIND_NAME.equals(token.getKind())
&& service.equals(token.getService())) {
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java Mon Nov 28 18:21:46 2011
@@ -79,11 +79,11 @@ public class JQueryUI extends HtmlBlock
@Override
protected void render(Block html) {
html.
- link(join("https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/themes/",
+ link(join("https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/",
getTheme(), "/jquery-ui.css")).
link(root_url("static/dt-1.7.5/css/jui-dt.css")).
- script("https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js").
- script("https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/jquery-ui.min.js").
+ script("https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js").
+ script("https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js").
script(root_url("static/dt-1.7.5/js/jquery.dataTables.min.js")).
script(root_url("static/yarn.dt.plugins.js")).
script(root_url("static/themeswitcher.js")).
@@ -224,7 +224,7 @@ public class JQueryUI extends HtmlBlock
}
public static StringBuilder tableInit() {
- return new StringBuilder("{bJQueryUI:true, aaSorting:[], ").
+ return new StringBuilder("{bJQueryUI:true, ").
append("sPaginationType: 'full_numbers', iDisplayLength:20, ").
append("aLengthMenu:[20, 40, 60, 80, 100]");
}
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java Mon Nov 28 18:21:46 2011
@@ -68,7 +68,7 @@ public class AuxServices extends Abstrac
/**
* @return the meta data for all registered services, that have been started.
* If a service has not been started no metadata will be available. The key
- * the the name of the service as defined in the configuration.
+ * is the name of the service as defined in the configuration.
*/
public Map<String, ByteBuffer> getMeta() {
Map<String, ByteBuffer> metaClone = new HashMap<String, ByteBuffer>(
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java Mon Nov 28 18:21:46 2011
@@ -51,6 +51,8 @@ public class AllApplicationsPage extends
private String appsTableInit() {
return tableInit().
+ // Sort by id upon page load
+ append(", aaSorting: [[0, 'asc']]").
// applicationid, applicationstate
append(", aoColumns:[null, null]} ").toString();
}
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApp.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApp.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApp.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApp.java Mon Nov 28 18:21:46 2011
@@ -53,6 +53,14 @@ import org.apache.hadoop.yarn.server.res
import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerReservedEvent;
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.Multiset;
+
+/**
+ * Represents an Application from the viewpoint of the scheduler.
+ * Each running Application in the RM corresponds to one instance
+ * of this class.
+ */
public class SchedulerApp {
private static final Log LOG = LogFactory.getLog(SchedulerApp.class);
@@ -76,11 +84,16 @@ public class SchedulerApp {
final Map<Priority, Map<NodeId, RMContainer>> reservedContainers =
new HashMap<Priority, Map<NodeId, RMContainer>>();
- Map<Priority, Integer> schedulingOpportunities =
- new HashMap<Priority, Integer>();
+ /**
+ * Count how many times the application has been given an opportunity
+ * to schedule a task at each priority. Each time the scheduler
+ * asks the application for a task at this priority, it is incremented,
+ * and each time the application successfully schedules a task, it
+ * is reset to 0.
+ */
+ Multiset<Priority> schedulingOpportunities = HashMultiset.create();
- Map<Priority, Integer> reReservations =
- new HashMap<Priority, Integer>();
+ Multiset<Priority> reReservations = HashMultiset.create();
Resource currentReservation = recordFactory
.newRecordInstance(Resource.class);
@@ -282,49 +295,33 @@ public class SchedulerApp {
}
synchronized public void resetSchedulingOpportunities(Priority priority) {
- this.schedulingOpportunities.put(priority, Integer.valueOf(0));
+ this.schedulingOpportunities.setCount(priority, 0);
}
synchronized public void addSchedulingOpportunity(Priority priority) {
- Integer schedulingOpportunities =
- this.schedulingOpportunities.get(priority);
- if (schedulingOpportunities == null) {
- schedulingOpportunities = 0;
- }
- ++schedulingOpportunities;
- this.schedulingOpportunities.put(priority, schedulingOpportunities);
+ this.schedulingOpportunities.setCount(priority,
+ schedulingOpportunities.count(priority) + 1);
}
+ /**
+ * Return the number of times the application has been given an opportunity
+ * to schedule a task at the given priority since the last time it
+ * successfully did so.
+ */
synchronized public int getSchedulingOpportunities(Priority priority) {
- Integer schedulingOpportunities =
- this.schedulingOpportunities.get(priority);
- if (schedulingOpportunities == null) {
- schedulingOpportunities = 0;
- this.schedulingOpportunities.put(priority, schedulingOpportunities);
- }
- return schedulingOpportunities;
+ return this.schedulingOpportunities.count(priority);
}
synchronized void resetReReservations(Priority priority) {
- this.reReservations.put(priority, Integer.valueOf(0));
+ this.reReservations.setCount(priority, 0);
}
synchronized void addReReservation(Priority priority) {
- Integer reReservations = this.reReservations.get(priority);
- if (reReservations == null) {
- reReservations = 0;
- }
- ++reReservations;
- this.reReservations.put(priority, reReservations);
+ this.reReservations.add(priority);
}
synchronized public int getReReservations(Priority priority) {
- Integer reReservations = this.reReservations.get(priority);
- if (reReservations == null) {
- reReservations = 0;
- this.reReservations.put(priority, reReservations);
- }
- return reReservations;
+ return this.reReservations.count(priority);
}
public synchronized int getNumReservedContainers(Priority priority) {
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java Mon Nov 28 18:21:46 2011
@@ -160,6 +160,10 @@ public class CapacitySchedulerConfigurat
return maxCapacity;
}
+ public void setMaximumCapacity(String queue, int maxCapacity) {
+ setInt(getQueuePrefix(queue) + MAXIMUM_CAPACITY, maxCapacity);
+ }
+
public int getUserLimit(String queue) {
int userLimit =
getInt(getQueuePrefix(queue) + USER_LIMIT, DEFAULT_USER_LIMIT);
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java Mon Nov 28 18:21:46 2011
@@ -211,16 +211,19 @@ public class LeafQueue implements CSQueu
private synchronized void setupQueueConfigs(
float capacity, float absoluteCapacity,
- float maxCapacity, float absoluteMaxCapacity,
+ float maximumCapacity, float absoluteMaxCapacity,
int userLimit, float userLimitFactor,
int maxApplications, int maxApplicationsPerUser,
int maxActiveApplications, int maxActiveApplicationsPerUser,
QueueState state, Map<QueueACL, AccessControlList> acls)
{
+ // Sanity check
+ CSQueueUtils.checkMaxCapacity(getQueueName(), capacity, maximumCapacity);
+
this.capacity = capacity;
this.absoluteCapacity = parent.getAbsoluteCapacity() * capacity;
- this.maximumCapacity = maxCapacity;
+ this.maximumCapacity = maximumCapacity;
this.absoluteMaxCapacity = absoluteMaxCapacity;
this.userLimit = userLimit;
@@ -236,9 +239,9 @@ public class LeafQueue implements CSQueu
this.acls = acls;
- this.queueInfo.setCapacity(capacity);
- this.queueInfo.setMaximumCapacity(maximumCapacity);
- this.queueInfo.setQueueState(state);
+ this.queueInfo.setCapacity(this.capacity);
+ this.queueInfo.setMaximumCapacity(this.maximumCapacity);
+ this.queueInfo.setQueueState(this.state);
StringBuilder aclsString = new StringBuilder();
for (Map.Entry<QueueACL, AccessControlList> e : acls.entrySet()) {
@@ -250,7 +253,7 @@ public class LeafQueue implements CSQueu
" [= (float) configuredCapacity / 100 ]" + "\n" +
"asboluteCapacity = " + absoluteCapacity +
" [= parentAbsoluteCapacity * capacity ]" + "\n" +
- "maxCapacity = " + maxCapacity +
+ "maxCapacity = " + maximumCapacity +
" [= configuredMaxCapacity ]" + "\n" +
"absoluteMaxCapacity = " + absoluteMaxCapacity +
" [= Float.MAX_VALUE if maximumCapacity undefined, " +
@@ -394,6 +397,9 @@ public class LeafQueue implements CSQueu
* @param maximumCapacity new max capacity
*/
synchronized void setMaxCapacity(float maximumCapacity) {
+ // Sanity check
+ CSQueueUtils.checkMaxCapacity(getQueueName(), capacity, maximumCapacity);
+
this.maximumCapacity = maximumCapacity;
this.absoluteMaxCapacity =
(maximumCapacity == CapacitySchedulerConfiguration.UNDEFINED) ?
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java Mon Nov 28 18:21:46 2011
@@ -153,6 +153,9 @@ public class ParentQueue implements CSQu
float maximumCapacity, float absoluteMaxCapacity,
QueueState state, Map<QueueACL, AccessControlList> acls
) {
+ // Sanity check
+ CSQueueUtils.checkMaxCapacity(getQueueName(), capacity, maximumCapacity);
+
this.capacity = capacity;
this.absoluteCapacity = absoluteCapacity;
this.maximumCapacity = maximumCapacity;
@@ -162,9 +165,9 @@ public class ParentQueue implements CSQu
this.acls = acls;
- this.queueInfo.setCapacity(capacity);
- this.queueInfo.setMaximumCapacity(maximumCapacity);
- this.queueInfo.setQueueState(state);
+ this.queueInfo.setCapacity(this.capacity);
+ this.queueInfo.setMaximumCapacity(this.maximumCapacity);
+ this.queueInfo.setQueueState(this.state);
StringBuilder aclsString = new StringBuilder();
for (Map.Entry<QueueACL, AccessControlList> e : acls.entrySet()) {
@@ -484,6 +487,9 @@ public class ParentQueue implements CSQu
* @param maximumCapacity new max capacity
*/
synchronized void setMaxCapacity(float maximumCapacity) {
+ // Sanity check
+ CSQueueUtils.checkMaxCapacity(getQueueName(), capacity, maximumCapacity);
+
this.maximumCapacity = maximumCapacity;
float parentAbsoluteCapacity =
(rootQueue) ? 100.0f : parent.getAbsoluteCapacity();
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java Mon Nov 28 18:21:46 2011
@@ -61,6 +61,10 @@ public class RmView extends TwoColumnLay
StringBuilder init = tableInit().
append(", aoColumns:[{sType:'title-numeric'}, null, null, null, null,").
append("null,{sType:'title-numeric', bSearchable:false}, null, null]");
+
+ // Sort by id upon page load
+ init.append(", aaSorting: [[0, 'asc']]");
+
String rows = $("rowlimit");
int rowLimit = rows.isEmpty() ? MAX_DISPLAY_ROWS : Integer.parseInt(rows);
if (list.apps.size() < rowLimit) {
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueParsing.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueParsing.java?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueParsing.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueParsing.java Mon Nov 28 18:21:46 2011
@@ -18,6 +18,8 @@
package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
+import junit.framework.Assert;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
@@ -35,7 +37,6 @@ public class TestQueueParsing {
CapacityScheduler capacityScheduler = new CapacityScheduler();
capacityScheduler.reinitialize(conf, null, null);
- //capacityScheduler.g
}
private void setupQueueConfiguration(CapacitySchedulerConfiguration conf) {
@@ -104,4 +105,48 @@ public class TestQueueParsing {
CapacityScheduler capacityScheduler = new CapacityScheduler();
capacityScheduler.reinitialize(conf, null, null);
}
+
+ public void testMaxCapacity() throws Exception {
+ CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration();
+
+ conf.setQueues(CapacityScheduler.ROOT, new String[] {"a", "b", "c"});
+ conf.setCapacity(CapacityScheduler.ROOT, 100);
+
+ final String A = CapacityScheduler.ROOT + ".a";
+ conf.setCapacity(A, 50);
+ conf.setMaximumCapacity(A, 60);
+
+ final String B = CapacityScheduler.ROOT + ".b";
+ conf.setCapacity(B, 50);
+ conf.setMaximumCapacity(B, 45); // Should throw an exception
+
+
+ boolean fail = false;
+ CapacityScheduler capacityScheduler;
+ try {
+ capacityScheduler = new CapacityScheduler();
+ capacityScheduler.reinitialize(conf, null, null);
+ } catch (IllegalArgumentException iae) {
+ fail = true;
+ }
+ Assert.assertTrue("Didn't throw IllegalArgumentException for wrong maxCap",
+ fail);
+
+ conf.setMaximumCapacity(B, 60);
+
+ // Now this should work
+ capacityScheduler = new CapacityScheduler();
+ capacityScheduler.reinitialize(conf, null, null);
+
+ fail = false;
+ try {
+ LeafQueue a = (LeafQueue)capacityScheduler.getQueue(A);
+ a.setMaxCapacity(45);
+ } catch (IllegalArgumentException iae) {
+ fail = true;
+ }
+ Assert.assertTrue("Didn't throw IllegalArgumentException for wrong " +
+ "setMaxCap", fail);
+ }
+
}
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/Federation.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/Federation.apt.vm?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/Federation.apt.vm (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/Federation.apt.vm Mon Nov 28 18:21:46 2011
@@ -12,7 +12,7 @@
~~ limitations under the License. See accompanying LICENSE file.
---
- Hadoop Map Reduce Next Generation-${project.version} - Cluster Setup
+ Hadoop Distributed File System-${project.version} - Federation
---
---
${maven.build.timestamp}
@@ -57,12 +57,12 @@ HDFS Federation
* Storage - is provided by datanodes by storing blocks on the local file
system and allows read/write access.
- The current HDFS architecture allows only a single namespace for the
+ The prior HDFS architecture allows only a single namespace for the
entire cluster. A single Namenode manages this namespace. HDFS
- Federation addresses limitation of current architecture by adding
+ Federation addresses limitation of the prior architecture by adding
support multiple Namenodes/namespaces to HDFS file system.
-* {HDFS Federation}
+* {Multiple Namenodes/Namespaces}
In order to scale the name service horizontally, federation uses multiple
independent Namenodes/namespaces. The Namenodes are federated, that is, the
@@ -103,9 +103,9 @@ HDFS Federation
of small files benefit from scaling the namespace by adding more
Namenodes to the cluster
- * Performance - File system operation throughput is currently limited
- by a single Namenode. Adding more Namenodes to the cluster scales the
- file system read/write operations throughput.
+ * Performance - File system operation throughput is limited by a single
+ Namenode in the prior architecture. Adding more Namenodes to the cluster
+ scales the file system read/write operations throughput.
* Isolation - A single Namenode offers no isolation in multi user
environment. An experimental application can overload the Namenode
@@ -265,7 +265,7 @@ HDFS Federation
> $HADOOP_PREFIX_HOME/bin/start-dfs.sh
----
- To start the cluster run the following command:
+ To stop the cluster run the following command:
----
> $HADOOP_PREFIX_HOME/bin/stop-dfs.sh
@@ -300,7 +300,7 @@ HDFS Federation
** Decommissioning
Decommissioning is similar to prior releases. The nodes that need to be
- decommissioning are added to the exclude file at all the Namenode. Each
+ decomissioned are added to the exclude file at all the Namenode. Each
Namenode decommissions its Block Pool. When all the Namenodes finish
decommissioning a datanode, the datanode is considered to be decommissioned.
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/c++:1159757-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/c++:1159757-1207485
/hadoop/core/branches/branch-0.19/mapred/src/c++:713112
/hadoop/core/trunk/src/c++:776175-784663
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:1152502-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:1152502-1207485
/hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
/hadoop/core/trunk/src/contrib:784664-785643
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:1152502-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:1152502-1207485
/hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
/hadoop/core/branches/branch-0.19/mapred/src/contrib/block_forensics:713112
/hadoop/core/trunk/src/contrib/block_forensics:784664-785643
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:1161333-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:1161333-1207485
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
/hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:1161333-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:1161333-1207485
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
/hadoop/core/trunk/src/contrib/build.xml:776175-786373
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:1159757-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:1159757-1207485
/hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
/hadoop/core/trunk/src/contrib/data_join:776175-786373
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:1159757-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:1159757-1207485
/hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
/hadoop/core/branches/branch-0.19/mapred/src/contrib/eclipse-plugin:713112
/hadoop/core/trunk/src/contrib/eclipse-plugin:776175-785643
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml Mon Nov 28 18:21:46 2011
@@ -64,6 +64,10 @@
rev="${yarn.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common"
rev="${yarn.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient"
+ rev="${yarn.version}" conf="test->default">
+ <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:1159757-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:1159757-1207485
/hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
/hadoop/core/trunk/src/contrib/index:776175-786373
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:1159757-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:1159757-1207485
/hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
/hadoop/core/trunk/src/contrib/vaidya:776175-786373
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/docs/changes/changes2html.pl
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/docs/changes/changes2html.pl?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/docs/changes/changes2html.pl (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/docs/changes/changes2html.pl Mon Nov 28 18:21:46 2011
@@ -242,7 +242,11 @@ for my $rel (@releases) {
$item =~ s:\s*(\([^)"]+?\))\s*$:<br />$1:; # Separate attribution
$item =~ s:\n{2,}:\n<p/>\n:g; # Keep paragraph breaks
- $item =~ s{(?:${jira_url_prefix})?(HADOOP-\d+)} # Link to JIRA
+ $item =~ s{(?:${jira_url_prefix})?(HADOOP-\d+)} # Link to JIRA Common
+ {<a href="${jira_url_prefix}$1">$1</a>}g;
+ $item =~ s{(?:${jira_url_prefix})?(HDFS-\d+)} # Link to JIRA Hdfs
+ {<a href="${jira_url_prefix}$1">$1</a>}g;
+ $item =~ s{(?:${jira_url_prefix})?(MAPREDUCE-\d+)} # Link to JIRA MR
{<a href="${jira_url_prefix}$1">$1</a>}g;
print " <li>$item</li>\n";
}
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml Mon Nov 28 18:21:46 2011
@@ -2060,9 +2060,7 @@
<p>Hadoop comes configured with a single mandatory queue, called
'default'. Queue names are defined in the
<code>mapred.queue.names</code> property of the Hadoop site
- configuration. Some job schedulers, such as the
- <a href="capacity_scheduler.html">Capacity Scheduler</a>,
- support multiple queues.</p>
+ configuration.</p>
<p>A job defines the queue it needs to be submitted to through the
<code>mapreduce.job.queuename</code> property.
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/examples:1152502-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/examples:1152502-1207485
/hadoop/core/branches/branch-0.19/mapred/src/examples:713112
/hadoop/core/trunk/src/examples:776175-784663
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/java:1152502-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/java:1152502-1207485
/hadoop/core/branches/branch-0.19/mapred/src/java:713112
/hadoop/core/trunk/src/mapred:776175-785643
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:1152502-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:1152502-1207485
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
/hadoop/core/trunk/src/test/mapred:776175-785643
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:1159757-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:1159757-1207485
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643
/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:1152502-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:1152502-1207485
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643
/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java:1161333-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java:1161333-1207485
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/FileBench.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:776175-785643
/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:1161333-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:1161333-1207485
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:776175-785643
/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:1159757-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:1159757-1207485
/hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs-with-mr/org/apache/hadoop/ipc:713112
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/ipc:713112
/hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:1161333-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:1161333-1207485
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:776175-785643
/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:1161333-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:1161333-1207485
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:776175-785643
/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:1152502-1204792
+/hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:1152502-1207485
/hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
/hadoop/core/trunk/src/webapps/job:776175-785643
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/analysejobhistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/analysejobhistory.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/analysejobhistory.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/analysejobhistory.jsp Mon Nov 28 18:21:46 2011
@@ -35,6 +35,7 @@
%>
<%! private static final long serialVersionUID = 1L;
%>
+<!DOCTYPE html>
<html><body>
<%
String logFile = request.getParameter("logFile");
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/job_authorization_error.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/job_authorization_error.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/job_authorization_error.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/job_authorization_error.jsp Mon Nov 28 18:21:46 2011
@@ -28,6 +28,7 @@
<%! private static final long serialVersionUID = 1L;
%>
+<!DOCTYPE html>
<html>
<head>
<title>Error: User cannot access this Job</title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobblacklistedtrackers.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobblacklistedtrackers.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobblacklistedtrackers.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobblacklistedtrackers.jsp Mon Nov 28 18:21:46 2011
@@ -74,6 +74,7 @@
}
%>
+<!DOCTYPE html>
<html>
<title>Hadoop <%=jobId%>'s black-listed tasktrackers</title>
<body>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobconf.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobconf.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobconf.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobconf.jsp Mon Nov 28 18:21:46 2011
@@ -39,7 +39,7 @@
return;
}
%>
-
+<!DOCTYPE html>
<html>
<title>Job Configuration: JobId - <%= jobId %></title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobconf_history.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobconf_history.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobconf_history.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobconf_history.jsp Mon Nov 28 18:21:46 2011
@@ -49,6 +49,7 @@
%>
+<!DOCTYPE html>
<html>
<title>Job Configuration: JobId - <%= jobId %></title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobdetails.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobdetails.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobdetails.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobdetails.jsp Mon Nov 28 18:21:46 2011
@@ -267,6 +267,7 @@
%>
<%@page import="org.apache.hadoop.mapred.TaskGraphServlet"%>
+<!DOCTYPE html>
<html>
<head>
<%
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobdetailshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobdetailshistory.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobdetailshistory.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobdetailshistory.jsp Mon Nov 28 18:21:46 2011
@@ -60,6 +60,7 @@
reasonforFailure = job.getErrorInfo();
%>
+<!DOCTYPE html>
<html>
<head>
<title>Hadoop Job <%=jobid%> on History Viewer</title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobfailures.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobfailures.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobfailures.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobfailures.jsp Mon Nov 28 18:21:46 2011
@@ -184,6 +184,7 @@
String cause = request.getParameter("cause");
%>
+<!DOCTYPE html>
<html>
<title>Hadoop <%=jobId%> failures on <%=trackerName%></title>
<body>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobhistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobhistory.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobhistory.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobhistory.jsp Mon Nov 28 18:21:46 2011
@@ -44,6 +44,7 @@
private static SimpleDateFormat dateFormat =
new SimpleDateFormat("d/MM HH:mm:ss");
%>
+<!DOCTYPE html>
<html>
<head>
<script type="text/JavaScript">
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobqueue_details.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobqueue_details.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobqueue_details.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobqueue_details.jsp Mon Nov 28 18:21:46 2011
@@ -35,6 +35,7 @@
TaskScheduler scheduler = tracker.getTaskScheduler();
JobQueueInfo schedInfo = tracker.getQueueInfo(queueName);
%>
+<!DOCTYPE html>
<html>
<head>
<title>Queue details for <%=queueName != null ? queueName : ""%> </title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtasks.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtasks.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtasks.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtasks.jsp Mon Nov 28 18:21:46 2011
@@ -75,6 +75,7 @@
}
%>
+<!DOCTYPE html>
<html>
<head>
<title>Hadoop <%=type%> task list for <%=jobid%> on <%=trackerName%></title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtaskshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtaskshistory.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtaskshistory.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtaskshistory.jsp Mon Nov 28 18:21:46 2011
@@ -53,6 +53,7 @@
}
Map<TaskID, JobHistoryParser.TaskInfo> tasks = job.getAllTasks();
%>
+<!DOCTYPE html>
<html>
<body>
<h2><%=taskStatus%> <%=taskType %> task list for <a href="jobdetailshistory.jsp?logFile=<%=logFile%>"><%=job.getJobId() %> </a></h2>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtracker.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtracker.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtracker.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/jobtracker.jsp Mon Nov 28 18:21:46 2011
@@ -100,6 +100,7 @@
}%>
+<!DOCTYPE html>
<html>
<head>
<title><%= trackerName %> Hadoop Map/Reduce Administration</title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/machines.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/machines.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/machines.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/machines.jsp Mon Nov 28 18:21:46 2011
@@ -165,6 +165,7 @@
}
%>
+<!DOCTYPE html>
<html>
<title><%=trackerName%> Hadoop Machine List</title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp Mon Nov 28 18:21:46 2011
@@ -27,6 +27,7 @@ import="javax.servlet.http.*"
import="java.io.*"
import="java.util.*"
%>
+<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/queuetable.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/queuetable.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/queuetable.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/queuetable.jsp Mon Nov 28 18:21:46 2011
@@ -32,6 +32,7 @@ private static final long serialVersionU
import="org.apache.hadoop.util.*"
import="org.apache.hadoop.util.ServletUtil"
%>
+<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskdetails.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskdetails.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskdetails.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskdetails.jsp Mon Nov 28 18:21:46 2011
@@ -174,6 +174,7 @@
%>
+<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" type="text/css" href="/static/hadoop.css">
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskdetailshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskdetailshistory.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskdetailshistory.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskdetailshistory.jsp Mon Nov 28 18:21:46 2011
@@ -51,6 +51,7 @@
JobHistoryParser.TaskInfo task = job.getAllTasks().get(TaskID.forName(tipid));
TaskType type = task.getTaskType();
%>
+<!DOCTYPE html>
<html>
<body>
<h2><%=tipid %> attempts for <a href="jobdetailshistory.jsp?logFile=<%=logFile%>"> <%=job.getJobId() %> </a></h2>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskstats.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskstats.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskstats.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskstats.jsp Mon Nov 28 18:21:46 2011
@@ -81,6 +81,7 @@
}
%>
+<!DOCTYPE html>
<html>
<head>
<title>Counters for <%=attemptid%></title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskstatshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskstatshistory.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskstatshistory.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/taskstatshistory.jsp Mon Nov 28 18:21:46 2011
@@ -66,6 +66,7 @@
Counters counters = attempt.getCounters();
%>
+<!DOCTYPE html>
<html>
<head>
<title>Counters for <%=attemptid%></title>
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/task/tasktracker.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/task/tasktracker.jsp?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/task/tasktracker.jsp (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/task/tasktracker.jsp Mon Nov 28 18:21:46 2011
@@ -35,6 +35,7 @@
String trackerName = tracker.getName();
%>
+<!DOCTYPE html>
<html>
<title><%= trackerName %> Task Tracker Status</title>