Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6627. Addendum patch for branch-2. (Sunil G via asuresh)

This commit is contained in:
Arun Suresh 2017-11-11 09:10:17 -08:00
parent 132c2e7a2a
commit 5cd92ed555
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
View File

@ -195,7 +195,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>hadoop-yarn/hadoop-yarn-ui/target/hadoop-yarn-ui-${project.version}</directory> <directory>hadoop-yarn/hadoop-yarn-ui/target/hadoop-yarn-ui-${project.version}</directory>
<outputDirectory>/share/hadoop/${hadoop.component}/webapps/rm</outputDirectory> <outputDirectory>/share/hadoop/${hadoop.component}/webapps/ui2</outputDirectory>
<includes> <includes>
<include>**/*</include> <include>**/*</include>
</includes> </includes>
@ -207,6 +207,9 @@
<include>org.apache.hadoop:hadoop-yarn-server-timelineservice</include> <include>org.apache.hadoop:hadoop-yarn-server-timelineservice</include>
<include>org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase</include> <include>org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase</include>
</includes> </includes>
<excludes>
<exclude>org.apache.hadoop:hadoop-yarn-ui</exclude>
</excludes>
<binaries> <binaries>
<outputDirectory>share/hadoop/${hadoop.component}/timelineservice</outputDirectory> <outputDirectory>share/hadoop/${hadoop.component}/timelineservice</outputDirectory>
<includeDependencies>false</includeDependencies> <includeDependencies>false</includeDependencies>

31
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
View File

@ -1082,33 +1082,48 @@ public class ResourceManager extends CompositeService implements Recoverable {
WebAppContext uiWebAppContext = null; WebAppContext uiWebAppContext = null;
if (getConfig().getBoolean(YarnConfiguration.YARN_WEBAPP_UI2_ENABLE, if (getConfig().getBoolean(YarnConfiguration.YARN_WEBAPP_UI2_ENABLE,
YarnConfiguration.DEFAULT_YARN_WEBAPP_UI2_ENABLE)) { YarnConfiguration.DEFAULT_YARN_WEBAPP_UI2_ENABLE)) {
String webPath = UI2_WEBAPP_NAME;
String onDiskPath = getConfig() String onDiskPath = getConfig()
.get(YarnConfiguration.YARN_WEBAPP_UI2_WARFILE_PATH); .get(YarnConfiguration.YARN_WEBAPP_UI2_WARFILE_PATH);
uiWebAppContext = new WebAppContext();
uiWebAppContext.setContextPath(UI2_WEBAPP_NAME);
if (null == onDiskPath) { if (null == onDiskPath) {
String war = "hadoop-yarn-ui-" + VersionInfo.getVersion() + ".war"; String war = "hadoop-yarn-ui-" + VersionInfo.getVersion() + ".war";
URLClassLoader cl = (URLClassLoader) ClassLoader.getSystemClassLoader(); URLClassLoader cl = (URLClassLoader) ClassLoader.getSystemClassLoader();
URL url = cl.findResource(war); URL url = cl.findResource(war);
if (null == url) { if (null == url) {
onDiskPath = ""; onDiskPath = getWebAppsPath("ui2");
} else { } else {
onDiskPath = url.getFile(); onDiskPath = url.getFile();
} }
LOG.info(
"New web UI war file name:" + war + ", and path:" + onDiskPath);
} }
uiWebAppContext = new WebAppContext(); if (onDiskPath == null || onDiskPath.isEmpty()) {
uiWebAppContext.setContextPath(webPath); LOG.error("No war file or webapps found for ui2 !");
uiWebAppContext.setWar(onDiskPath); } else {
if (onDiskPath.endsWith(".war")) {
uiWebAppContext.setWar(onDiskPath);
LOG.info("Using war file at: " + onDiskPath);
} else {
uiWebAppContext.setResourceBase(onDiskPath);
LOG.info("Using webapps at: " + onDiskPath);
}
}
} }
webApp = builder.start(new RMWebApp(this), uiWebAppContext); webApp = builder.start(new RMWebApp(this), uiWebAppContext);
} }
private String getWebAppsPath(String appName) {
URL url = getClass().getClassLoader().getResource("webapps/" + appName);
if (url == null) {
return "";
}
return url.toString();
}
/** /**
* Helper method to create and init {@link #activeServices}. This creates an * Helper method to create and init {@link #activeServices}. This creates an
* instance of {@link RMActiveServices} and initializes it. * instance of {@link RMActiveServices} and initializes it.