You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2017/11/11 17:10:55 UTC
hadoop git commit: YARN-6627. Addendum patch for branch-2. (Sunil G
via asuresh)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 132c2e7a2 -> 5cd92ed55
YARN-6627. Addendum patch for branch-2. (Sunil G via asuresh)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5cd92ed5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5cd92ed5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5cd92ed5
Branch: refs/heads/branch-2
Commit: 5cd92ed555cadf4897e4ab378fcc6691bfbd6bbe
Parents: 132c2e7
Author: Arun Suresh <as...@apache.org>
Authored: Sat Nov 11 09:10:17 2017 -0800
Committer: Arun Suresh <as...@apache.org>
Committed: Sat Nov 11 09:10:17 2017 -0800
----------------------------------------------------------------------
.../resources/assemblies/hadoop-yarn-dist.xml | 5 +++-
.../server/resourcemanager/ResourceManager.java | 31 +++++++++++++++-----
2 files changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5cd92ed5/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
----------------------------------------------------------------------
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
index 0f66757..65cd28f 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
@@ -195,7 +195,7 @@
</fileSet>
<fileSet>
<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>
<include>**/*</include>
</includes>
@@ -207,6 +207,9 @@
<include>org.apache.hadoop:hadoop-yarn-server-timelineservice</include>
<include>org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase</include>
</includes>
+ <excludes>
+ <exclude>org.apache.hadoop:hadoop-yarn-ui</exclude>
+ </excludes>
<binaries>
<outputDirectory>share/hadoop/${hadoop.component}/timelineservice</outputDirectory>
<includeDependencies>false</includeDependencies>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5cd92ed5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 944cb6d..add1f91 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -1082,33 +1082,48 @@ public class ResourceManager extends CompositeService implements Recoverable {
WebAppContext uiWebAppContext = null;
if (getConfig().getBoolean(YarnConfiguration.YARN_WEBAPP_UI2_ENABLE,
YarnConfiguration.DEFAULT_YARN_WEBAPP_UI2_ENABLE)) {
- String webPath = UI2_WEBAPP_NAME;
String onDiskPath = getConfig()
.get(YarnConfiguration.YARN_WEBAPP_UI2_WARFILE_PATH);
+ uiWebAppContext = new WebAppContext();
+ uiWebAppContext.setContextPath(UI2_WEBAPP_NAME);
+
if (null == onDiskPath) {
String war = "hadoop-yarn-ui-" + VersionInfo.getVersion() + ".war";
URLClassLoader cl = (URLClassLoader) ClassLoader.getSystemClassLoader();
URL url = cl.findResource(war);
if (null == url) {
- onDiskPath = "";
+ onDiskPath = getWebAppsPath("ui2");
} else {
onDiskPath = url.getFile();
}
-
- LOG.info(
- "New web UI war file name:" + war + ", and path:" + onDiskPath);
}
- uiWebAppContext = new WebAppContext();
- uiWebAppContext.setContextPath(webPath);
- uiWebAppContext.setWar(onDiskPath);
+ if (onDiskPath == null || onDiskPath.isEmpty()) {
+ LOG.error("No war file or webapps found for ui2 !");
+ } 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);
}
+ 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
* instance of {@link RMActiveServices} and initializes it.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org