Merge -r 1176680:1176681 from trunk to branch-0.23 to fix MAPREDUCE-3021.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176683 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy
parent
c7a11af6df
commit
eb30a784d1
|
|
@ -1425,6 +1425,9 @@ Release 0.23.0 - Unreleased
|
|||
|
||||
MAPREDUCE-3054. Unable to kill submitted jobs. (mahadev)
|
||||
|
||||
MAPREDUCE-3021. Change base urls for RM web-ui. (Thomas Graves via
|
||||
acmurthy)
|
||||
|
||||
Release 0.22.0 - Unreleased
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ public class MRClientService extends AbstractService
|
|||
+ ":" + server.getPort());
|
||||
LOG.info("Instantiated MRClientService at " + this.bindAddress);
|
||||
try {
|
||||
webApp = WebApps.$for("yarn", AppContext.class, appContext).with(conf).
|
||||
webApp = WebApps.$for("mapreduce", AppContext.class, appContext).with(conf).
|
||||
start(new AMWebApp());
|
||||
} catch (Exception e) {
|
||||
LOG.error("Webapps failed to start. Ignoring for now:", e);
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ public class NavBlock extends HtmlBlock {
|
|||
div("#nav").
|
||||
h3("Cluster").
|
||||
ul().
|
||||
li().a(url(rmweb, prefix(), "cluster"), "About")._().
|
||||
li().a(url(rmweb, prefix(), "apps"), "Applications")._().
|
||||
li().a(url(rmweb, prefix(), "scheduler"), "Scheduler")._()._().
|
||||
li().a(url(rmweb, "cluster", "cluster"), "About")._().
|
||||
li().a(url(rmweb, "cluster", "apps"), "Applications")._().
|
||||
li().a(url(rmweb, "cluster", "scheduler"), "Scheduler")._()._().
|
||||
h3("Application").
|
||||
ul().
|
||||
li().a(url("app/info"), "About")._().
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ public class TaskPage extends AppView {
|
|||
if (containerId != null) {
|
||||
String containerIdStr = ConverterUtils.toString(containerId);
|
||||
nodeTd._(" ").
|
||||
a(".logslink", url("http://", nodeHttpAddr, "yarn", "containerlogs",
|
||||
a(".logslink", url("http://", nodeHttpAddr, "node", "containerlogs",
|
||||
containerIdStr), "logs");
|
||||
}
|
||||
nodeTd._().
|
||||
|
|
|
|||
|
|
@ -489,7 +489,7 @@ public class JobHistoryUtils {
|
|||
sb.append(address.getHostName());
|
||||
}
|
||||
sb.append(":").append(address.getPort());
|
||||
sb.append("/yarn/job/"); // TODO This will change when the history server
|
||||
sb.append("/jobhistory/job/"); // TODO This will change when the history server
|
||||
// understands apps.
|
||||
// TOOD Use JobId toString once UI stops using _id_id
|
||||
sb.append("job_").append(appId.getClusterTimestamp());
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ public class HistoryClientService extends AbstractService {
|
|||
webApp = new HsWebApp(history);
|
||||
String bindAddress = conf.get(JHAdminConfig.MR_HISTORY_WEBAPP_ADDRESS,
|
||||
JHAdminConfig.DEFAULT_MR_HISTORY_WEBAPP_ADDRESS);
|
||||
WebApps.$for("yarn", this).at(bindAddress).start(webApp);
|
||||
WebApps.$for("jobhistory", this).at(bindAddress).start(webApp);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -386,6 +386,6 @@ public class YarnConfiguration extends Configuration {
|
|||
// Use apps manager address to figure out the host for webapp
|
||||
addr = conf.get(YarnConfiguration.RM_ADDRESS, YarnConfiguration.DEFAULT_RM_ADDRESS);
|
||||
String host = ADDR_SPLITTER.split(addr).iterator().next();
|
||||
return JOINER.join("http://", host, ":", port, "/");
|
||||
return JOINER.join("http://", host, ":", port);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.hadoop.yarn.conf;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
|
||||
import junit.framework.Assert;
|
||||
|
||||
import org.apache.avro.ipc.Server;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.yarn.conf.YarnConfiguration;
|
||||
import org.junit.Test;
|
||||
|
||||
public class TestYarnConfiguration {
|
||||
|
||||
@Test
|
||||
public void testDefaultRMWebUrl() throws Exception {
|
||||
YarnConfiguration conf = new YarnConfiguration();
|
||||
String rmWebUrl = YarnConfiguration.getRMWebAppURL(conf);
|
||||
// shouldn't have a "/" on the end of the url as all the other uri routinnes
|
||||
// specifically add slashes and Jetty doesn't handle double slashes.
|
||||
Assert.assertEquals("RM Web Url is not correct", "http://0.0.0.0:8088",
|
||||
rmWebUrl);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRMWebUrlSpecified() throws Exception {
|
||||
YarnConfiguration conf = new YarnConfiguration();
|
||||
// seems a bit odd but right now we are forcing webapp for RM to be RM_ADDRESS
|
||||
// for host and use the port from the RM_WEBAPP_ADDRESS
|
||||
conf.set(YarnConfiguration.RM_WEBAPP_ADDRESS, "footesting:99110");
|
||||
conf.set(YarnConfiguration.RM_ADDRESS, "rmtesting:9999");
|
||||
String rmWebUrl = YarnConfiguration.getRMWebAppURL(conf);
|
||||
Assert.assertEquals("RM Web Url is not correct", "http://rmtesting:99110",
|
||||
rmWebUrl);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -57,7 +57,7 @@ public class WebServer extends AbstractService {
|
|||
LOG.info("Instantiating NMWebApp at " + bindAddress);
|
||||
try {
|
||||
this.webApp =
|
||||
WebApps.$for("yarn", Context.class, this.nmContext)
|
||||
WebApps.$for("node", Context.class, this.nmContext)
|
||||
.at(bindAddress).with(getConfig())
|
||||
.start(new NMWebApp(this.resourceView));
|
||||
} catch (Exception e) {
|
||||
|
|
|
|||
|
|
@ -385,7 +385,7 @@ public class ResourceManager extends CompositeService implements Recoverable {
|
|||
}
|
||||
|
||||
protected void startWepApp() {
|
||||
webApp = WebApps.$for("yarn", masterService).at(
|
||||
webApp = WebApps.$for("cluster", masterService).at(
|
||||
conf.get(YarnConfiguration.RM_WEBAPP_ADDRESS,
|
||||
YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS)).
|
||||
start(new RMWebApp(this));
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ public class RmController extends Controller {
|
|||
.getMasterContainer();
|
||||
if (masterContainer != null) {
|
||||
String url = join("http://", masterContainer.getNodeHttpAddress(),
|
||||
"/yarn", "/containerlogs/",
|
||||
"/node", "/containerlogs/",
|
||||
ConverterUtils.toString(masterContainer.getId()));
|
||||
info._("AM container logs:", url, url);
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in New Issue