YARN-179. Fix some unit test failures. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1401481 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
382b565e8c
commit
88d326f0a4
|
@ -88,6 +88,8 @@ Release 2.0.3-alpha - Unreleased
|
|||
|
||||
YARN-140. Add capacity-scheduler-default.xml to provide a default set of configurations for the capacity scheduler. (ahmed via tucu)
|
||||
|
||||
YARN-179. Fix some unit test failures. (Vinod Kumar Vavilapalli via sseth)
|
||||
|
||||
Release 2.0.2-alpha - 2012-09-07
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -51,6 +51,12 @@
|
|||
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
|
||||
<scope>test</scope>
|
||||
<type>test-jar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-yarn-server-common</artifactId>
|
||||
|
|
|
@ -143,7 +143,7 @@ public class UnmanagedAMLauncher {
|
|||
|
||||
appName = cliParser.getOptionValue("appname", "UnmanagedAM");
|
||||
amPriority = Integer.parseInt(cliParser.getOptionValue("priority", "0"));
|
||||
amQueue = cliParser.getOptionValue("queue", "");
|
||||
amQueue = cliParser.getOptionValue("queue", "default");
|
||||
classpath = cliParser.getOptionValue("classpath", null);
|
||||
|
||||
amCmd = cliParser.getOptionValue("cmd");
|
||||
|
|
|
@ -141,6 +141,8 @@ public class TestUnmanagedAMLauncher {
|
|||
String[] args = {
|
||||
"--classpath",
|
||||
classpath,
|
||||
"--queue",
|
||||
"default",
|
||||
"--cmd",
|
||||
javaHome
|
||||
+ "/bin/java -Xmx512m "
|
||||
|
|
|
@ -38,5 +38,12 @@
|
|||
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
|
||||
<scope>test</scope>
|
||||
<type>test-jar</type>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
@ -45,7 +45,6 @@ import org.apache.hadoop.yarn.api.records.QueueInfo;
|
|||
import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
|
||||
import org.apache.hadoop.yarn.api.records.Resource;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceRequest;
|
||||
import org.apache.hadoop.yarn.conf.YarnConfiguration;
|
||||
import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.RMAuditLogger;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.RMAuditLogger.AuditConstants;
|
||||
|
@ -111,21 +110,18 @@ implements ResourceScheduler, CapacitySchedulerContext, Configurable {
|
|||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
public void setConf(Configuration conf) {
|
||||
if (conf instanceof YarnConfiguration) {
|
||||
yarnConf = (YarnConfiguration) conf;
|
||||
} else {
|
||||
throw new IllegalArgumentException("Can only configure with " +
|
||||
"YarnConfiguration");
|
||||
}
|
||||
yarnConf = conf;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Configuration getConf() {
|
||||
return yarnConf;
|
||||
}
|
||||
|
||||
private CapacitySchedulerConfiguration conf;
|
||||
private YarnConfiguration yarnConf;
|
||||
private Configuration yarnConf;
|
||||
private RMContext rmContext;
|
||||
|
||||
private Map<String, CSQueue> queues = new ConcurrentHashMap<String, CSQueue>();
|
||||
|
|
Loading…
Reference in New Issue