Author: szetszwo
Date: Fri Jan 3 07:26:52 2014
New Revision: 1555021
URL: http://svn.apache.org/r1555021
Log:
Merge r1550130 through r1555020 from trunk.
Added:
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java
- copied unchanged from r1555020,
hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerWrapper.java
- copied unchanged from r1555020,
hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerWrapper.java
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/test/resources/capacity-scheduler.xml
- copied unchanged from r1555020,
hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/capacity-scheduler.xml
Modified:
hadoop/common/branches/HDFS-5535/ (props changed)
hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-extras/pom.xml
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-streaming/pom.xml
Propchange: hadoop/common/branches/HDFS-5535/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/HDFS-2832:r1513717-1550362
Merged /hadoop/common/branches/branch-2:r1551915,1554802
Merged /hadoop/common/trunk:r1550130-1555020
Modified: hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml?rev=1555021&r1=1555020&r2=1555021&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml Fri Jan 3 07:26:52
2014
@@ -318,6 +318,11 @@
<version>11.0.2</version>
</dependency>
<dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.2.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
@@ -433,6 +438,12 @@
<artifactId>guice</artifactId>
<version>3.0</version>
</dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.2</version>
+ </dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
@@ -508,7 +519,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
<exclusions>
<exclusion>
<groupId>avalon-framework</groupId>
Modified: hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-extras/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-extras/pom.xml?rev=1555021&r1=1555020&r2=1555021&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-extras/pom.xml
(original)
+++ hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-extras/pom.xml Fri Jan
3 07:26:52 2014
@@ -94,6 +94,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified:
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java?rev=1555021&r1=1555020&r2=1555021&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
Fri Jan 3 07:26:52 2014
@@ -40,12 +40,15 @@ import org.apache.hadoop.tools.rumen.Log
import org.apache.hadoop.yarn.api.records.NodeState;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
import org.apache.hadoop.yarn.sls.appmaster.AMSimulator;
import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
import org.apache.hadoop.yarn.sls.nodemanager.NMSimulator;
import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
import org.apache.hadoop.yarn.sls.scheduler.ResourceSchedulerWrapper;
+import org.apache.hadoop.yarn.sls.scheduler.SLSCapacityScheduler;
import org.apache.hadoop.yarn.sls.scheduler.TaskRunner;
+import org.apache.hadoop.yarn.sls.scheduler.SchedulerWrapper;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -140,9 +143,9 @@ public class SLSRunner {
// start application masters
startAM();
// set queue & tracked apps information
- ((ResourceSchedulerWrapper) rm.getResourceScheduler())
+ ((SchedulerWrapper) rm.getResourceScheduler())
.setQueueSet(this.queueAppNumMap.keySet());
- ((ResourceSchedulerWrapper) rm.getResourceScheduler())
+ ((SchedulerWrapper) rm.getResourceScheduler())
.setTrackedAppSet(this.trackedApps);
// print out simulation info
printSimulationInfo();
@@ -151,13 +154,24 @@ public class SLSRunner {
// starting the runner once everything is ready to go,
runner.start();
}
-
+
private void startRM() throws IOException, ClassNotFoundException {
Configuration rmConf = new YarnConfiguration();
String schedulerClass = rmConf.get(YarnConfiguration.RM_SCHEDULER);
- rmConf.set(SLSConfiguration.RM_SCHEDULER, schedulerClass);
- rmConf.set(YarnConfiguration.RM_SCHEDULER,
- ResourceSchedulerWrapper.class.getName());
+
+ // For CapacityScheduler we use a sub-classing instead of wrapping
+ // to allow scheduler-specific invocations from monitors to work
+ // this can be used for other schedulers as well if we care to
+ // exercise/track behaviors that are not common to the scheduler api
+ if(Class.forName(schedulerClass) == CapacityScheduler.class) {
+ rmConf.set(YarnConfiguration.RM_SCHEDULER,
+ SLSCapacityScheduler.class.getName());
+ } else {
+ rmConf.set(YarnConfiguration.RM_SCHEDULER,
+ ResourceSchedulerWrapper.class.getName());
+ rmConf.set(SLSConfiguration.RM_SCHEDULER, schedulerClass);
+ }
+
rmConf.set(SLSConfiguration.METRICS_OUTPUT_DIR, metricsOutputDir);
rm = new ResourceManager();
rm.init(rmConf);
Modified:
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java?rev=1555021&r1=1555020&r2=1555021&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
Fri Jan 3 07:26:52 2014
@@ -65,7 +65,7 @@ import org.apache.hadoop.yarn.util.Recor
import org.apache.log4j.Logger;
import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
-import org.apache.hadoop.yarn.sls.scheduler.ResourceSchedulerWrapper;
+import org.apache.hadoop.yarn.sls.scheduler.SchedulerWrapper;
import org.apache.hadoop.yarn.sls.SLSRunner;
import org.apache.hadoop.yarn.sls.scheduler.TaskRunner;
import org.apache.hadoop.yarn.sls.utils.SLSUtils;
@@ -193,7 +193,7 @@ public abstract class AMSimulator extend
simulateFinishTimeMS = System.currentTimeMillis() -
SLSRunner.getRunner().getStartTimeMS();
// record job running information
- ((ResourceSchedulerWrapper)rm.getResourceScheduler())
+ ((SchedulerWrapper)rm.getResourceScheduler())
.addAMRuntime(appId,
traceStartTimeMS, traceFinishTimeMS,
simulateStartTimeMS, simulateFinishTimeMS);
@@ -314,13 +314,13 @@ public abstract class AMSimulator extend
private void trackApp() {
if (isTracked) {
- ((ResourceSchedulerWrapper) rm.getResourceScheduler())
+ ((SchedulerWrapper) rm.getResourceScheduler())
.addTrackedApp(appAttemptId, oldAppId);
}
}
public void untrackApp() {
if (isTracked) {
- ((ResourceSchedulerWrapper) rm.getResourceScheduler())
+ ((SchedulerWrapper) rm.getResourceScheduler())
.removeTrackedApp(appAttemptId, oldAppId);
}
}
Modified:
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java?rev=1555021&r1=1555020&r2=1555021&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
Fri Jan 3 07:26:52 2014
@@ -17,22 +17,30 @@
*/
package org.apache.hadoop.yarn.sls.scheduler;
-import org.apache.hadoop.util.ShutdownHookManager;
-import org.apache.hadoop.yarn.sls.SLSRunner;
-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
-import org.apache.hadoop.yarn.sls.web.SLSWebApp;
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.CsvReporter;
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.SlidingWindowReservoir;
-import com.codahale.metrics.Timer;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
-import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport;
@@ -41,64 +49,45 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerStatus;
import org.apache.hadoop.yarn.api.records.NodeId;
+import org.apache.hadoop.yarn.api.records.QueueACL;
import org.apache.hadoop.yarn.api.records.QueueInfo;
import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
-import org.apache.hadoop.yarn.api.records.QueueACL;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.api.records.ResourceRequest;
import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore;
import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
-import org.apache.hadoop.yarn.server.resourcemanager.rmnode
- .UpdatedContainerInfo;
+import
org.apache.hadoop.yarn.server.resourcemanager.rmnode.UpdatedContainerInfo;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler
- .ResourceScheduler;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler
- .SchedulerAppReport;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler
- .SchedulerNodeReport;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity
- .CapacityScheduler;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event
- .AppAddedSchedulerEvent;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event
- .AppRemovedSchedulerEvent;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event
- .NodeUpdateSchedulerEvent;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event
- .SchedulerEvent;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event
- .SchedulerEventType;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair
- .FairScheduler;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo
- .FifoScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerAppReport;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNodeReport;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAddedSchedulerEvent;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptRemovedSchedulerEvent;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppRemovedSchedulerEvent;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
+import org.apache.hadoop.yarn.sls.SLSRunner;
+import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+import org.apache.hadoop.yarn.sls.web.SLSWebApp;
import org.apache.hadoop.yarn.util.resource.Resources;
import org.apache.log4j.Logger;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import com.codahale.metrics.Counter;
+import com.codahale.metrics.CsvReporter;
+import com.codahale.metrics.Gauge;
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.SlidingWindowReservoir;
+import com.codahale.metrics.Timer;
-public class ResourceSchedulerWrapper implements ResourceScheduler,
- Configurable {
+public class ResourceSchedulerWrapper implements
+ SchedulerWrapper,ResourceScheduler,Configurable {
private static final String EOL = System.getProperty("line.separator");
private static final int SAMPLING_SIZE = 60;
private ScheduledExecutorService pool;
@@ -117,8 +106,8 @@ public class ResourceSchedulerWrapper im
private Configuration conf;
private ResourceScheduler scheduler;
- private Map<ApplicationAttemptId, String> appQueueMap =
- new ConcurrentHashMap<ApplicationAttemptId, String>();
+ private Map<ApplicationId, String> appQueueMap =
+ new ConcurrentHashMap<ApplicationId, String>();
private BufferedWriter jobRuntimeLogBW;
// Priority of the ResourceSchedulerWrapper shutdown hook.
@@ -162,9 +151,8 @@ public class ResourceSchedulerWrapper im
public void setConf(Configuration conf) {
this.conf = conf;
// set scheduler
- Class<? extends ResourceScheduler> klass =
- conf.getClass(SLSConfiguration.RM_SCHEDULER, null,
- ResourceScheduler.class);
+ Class<? extends ResourceScheduler> klass = conf.getClass(
+ SLSConfiguration.RM_SCHEDULER, null, ResourceScheduler.class);
scheduler = ReflectionUtils.newInstance(klass, conf);
// start metrics
@@ -246,14 +234,14 @@ public class ResourceSchedulerWrapper im
(NodeUpdateSchedulerEvent)schedulerEvent);
schedulerEvent = eventWrapper;
updateQueueWithNodeUpdate(eventWrapper);
- } else if (schedulerEvent.getType() == SchedulerEventType.APP_REMOVED
- && schedulerEvent instanceof AppRemovedSchedulerEvent) {
+ } else if (schedulerEvent.getType() ==
SchedulerEventType.APP_ATTEMPT_REMOVED
+ && schedulerEvent instanceof AppAttemptRemovedSchedulerEvent) {
// check if having AM Container, update resource usage information
- AppRemovedSchedulerEvent appRemoveEvent =
- (AppRemovedSchedulerEvent) schedulerEvent;
+ AppAttemptRemovedSchedulerEvent appRemoveEvent =
+ (AppAttemptRemovedSchedulerEvent) schedulerEvent;
ApplicationAttemptId appAttemptId =
appRemoveEvent.getApplicationAttemptID();
- String queue = appQueueMap.get(appAttemptId);
+ String queue = appQueueMap.get(appAttemptId.getApplicationId());
SchedulerAppReport app = scheduler.getSchedulerAppInfo(appAttemptId);
if (! app.getLiveContainers().isEmpty()) { // have 0 or 1
// should have one container which is AM container
@@ -276,19 +264,17 @@ public class ResourceSchedulerWrapper im
schedulerHandleCounterMap.get(schedulerEvent.getType()).inc();
if (schedulerEvent.getType() == SchedulerEventType.APP_REMOVED
- && schedulerEvent instanceof AppRemovedSchedulerEvent) {
+ && schedulerEvent instanceof AppRemovedSchedulerEvent) {
SLSRunner.decreaseRemainingApps();
AppRemovedSchedulerEvent appRemoveEvent =
(AppRemovedSchedulerEvent) schedulerEvent;
- ApplicationAttemptId appAttemptId =
- appRemoveEvent.getApplicationAttemptID();
- appQueueMap.remove(appRemoveEvent.getApplicationAttemptID());
+ appQueueMap.remove(appRemoveEvent.getApplicationID());
} else if (schedulerEvent.getType() == SchedulerEventType.APP_ADDED
- && schedulerEvent instanceof AppAddedSchedulerEvent) {
+ && schedulerEvent instanceof AppAddedSchedulerEvent) {
AppAddedSchedulerEvent appAddEvent =
(AppAddedSchedulerEvent) schedulerEvent;
String queueName = appAddEvent.getQueue();
- appQueueMap.put(appAddEvent.getApplicationAttemptId(), queueName);
+ appQueueMap.put(appAddEvent.getApplicationId(), queueName);
}
}
}
@@ -310,7 +296,9 @@ public class ResourceSchedulerWrapper im
continue;
}
- String queue = appQueueMap.get(containerId.getApplicationAttemptId());
+ String queue =
+ appQueueMap.get(containerId.getApplicationAttemptId()
+ .getApplicationId());
int releasedMemory = 0, releasedVCores = 0;
if (status.getExitStatus() == ContainerExitStatus.SUCCESS) {
for (RMContainer rmc : app.getLiveContainers()) {
@@ -342,7 +330,7 @@ public class ResourceSchedulerWrapper im
// update queue information
Resource pendingResource = Resources.createResource(0, 0);
Resource allocatedResource = Resources.createResource(0, 0);
- String queueName = appQueueMap.get(attemptId);
+ String queueName = appQueueMap.get(attemptId.getApplicationId());
// container requested
for (ResourceRequest request : resourceRequests) {
if (request.getResourceName().equals(ResourceRequest.ANY)) {
@@ -873,4 +861,3 @@ public class ResourceSchedulerWrapper im
return scheduler.getAppsInQueue(queue);
}
}
-
Modified:
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java?rev=1555021&r1=1555020&r2=1555021&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
Fri Jan 3 07:26:52 2014
@@ -41,6 +41,8 @@ import org.apache.hadoop.yarn.sls.SLSRun
import org.apache.hadoop.yarn.sls.scheduler.FairSchedulerMetrics;
import org.apache.hadoop.yarn.sls.scheduler.ResourceSchedulerWrapper;
import org.apache.hadoop.yarn.sls.scheduler.SchedulerMetrics;
+import org.apache.hadoop.yarn.sls.scheduler.SchedulerWrapper;
+
import com.codahale.metrics.Counter;
import com.codahale.metrics.Gauge;
import com.codahale.metrics.Histogram;
@@ -50,7 +52,7 @@ import org.mortbay.jetty.handler.Resourc
public class SLSWebApp extends HttpServlet {
private static final long serialVersionUID = 1905162041950251407L;
private transient Server server;
- private transient ResourceSchedulerWrapper wrapper;
+ private transient SchedulerWrapper wrapper;
private transient MetricRegistry metrics;
private transient SchedulerMetrics schedulerMetrics;
// metrics objects
@@ -90,7 +92,7 @@ public class SLSWebApp extends HttpServl
}
}
- public SLSWebApp(ResourceSchedulerWrapper wrapper, int metricsAddressPort) {
+ public SLSWebApp(SchedulerWrapper wrapper, int metricsAddressPort) {
this.wrapper = wrapper;
metrics = wrapper.getMetrics();
handleOperTimecostHistogramMap =
Modified:
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml?rev=1555021&r1=1555020&r2=1555021&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
Fri Jan 3 07:26:52 2014
@@ -17,7 +17,18 @@
<configuration>
<property>
<name>yarn.resourcemanager.scheduler.class</name>
-
<value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler</value>
+
<value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler</value>
+ <!--
<value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value>
-->
+ </property>
+
+ <property>
+ <name>yarn.resourcemanager.scheduler.monitor.enable</name>
+ <value>true</value>
+ </property>
+
+ <property>
+ <name>yarn.resourcemanager.scheduler.monitor.policies</name>
+
<value>org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy</value>
</property>
<property>
Modified: hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-streaming/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-streaming/pom.xml?rev=1555021&r1=1555020&r2=1555021&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-streaming/pom.xml
(original)
+++ hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-streaming/pom.xml Fri
Jan 3 07:26:52 2014
@@ -100,6 +100,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
