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 na...@apache.org on 2018/04/28 12:51:18 UTC
[19/50] [abbrv] hadoop git commit: YARN-8215. ATS v2 returns invalid
YARN_CONTAINER_ALLOCATED_HOST_HTTP_ADDRESS from NM. Contributed by Rohith
Sharma K S.
YARN-8215. ATS v2 returns invalid YARN_CONTAINER_ALLOCATED_HOST_HTTP_ADDRESS from NM. Contributed by Rohith Sharma K S.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7fc09c4f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7fc09c4f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7fc09c4f
Branch: refs/heads/YARN-3409
Commit: 7fc09c4f7255645025ddf902dff70a17092ea039
Parents: 1634de0
Author: Sunil G <su...@apache.org>
Authored: Fri Apr 27 10:33:42 2018 +0530
Committer: Sunil G <su...@apache.org>
Committed: Fri Apr 27 10:33:42 2018 +0530
----------------------------------------------------------------------
.../timelineservice/NMTimelinePublisher.java | 15 ++++++++++-----
.../timelineservice/TestNMTimelinePublisher.java | 1 -
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7fc09c4f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
index 2ce3c5e..13d5c67 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
@@ -23,6 +23,8 @@ import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,6 +82,7 @@ public class NMTimelinePublisher extends CompositeService {
private NodeId nodeId;
private String httpAddress;
+ private String httpPort;
private UserGroupInformation nmLoginUGI;
@@ -101,6 +104,12 @@ public class NMTimelinePublisher extends CompositeService {
UserGroupInformation.getLoginUser() :
UserGroupInformation.getCurrentUser();
LOG.info("Initialized NMTimelinePublisher UGI to " + nmLoginUGI);
+
+ String webAppURLWithoutScheme =
+ WebAppUtils.getNMWebAppURLWithoutScheme(conf);
+ if (webAppURLWithoutScheme.contains(":")) {
+ httpPort = webAppURLWithoutScheme.split(":")[1];
+ }
super.serviceInit(conf);
}
@@ -110,6 +119,7 @@ public class NMTimelinePublisher extends CompositeService {
// context will be updated after containerManagerImpl is started
// hence NMMetricsPublisher is added subservice of containerManagerImpl
this.nodeId = context.getNodeId();
+ this.httpAddress = nodeId.getHost() + ":" + httpPort;
}
@Override
@@ -331,11 +341,6 @@ public class NMTimelinePublisher extends CompositeService {
public void publishContainerEvent(ContainerEvent event) {
// publish only when the desired event is received
- if (this.httpAddress == null) {
- // update httpAddress for first time. When this service started,
- // web server will not be started.
- this.httpAddress = nodeId.getHost() + ":" + context.getHttpPort();
- }
switch (event.getType()) {
case INIT_CONTAINER:
publishContainerCreatedEvent(event);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7fc09c4f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/TestNMTimelinePublisher.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/TestNMTimelinePublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/TestNMTimelinePublisher.java
index 0b8eaa9..43196c7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/TestNMTimelinePublisher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/TestNMTimelinePublisher.java
@@ -53,7 +53,6 @@ public class TestNMTimelinePublisher {
@SuppressWarnings("unchecked")
final DummyTimelineClient timelineClient = new DummyTimelineClient(null);
when(context.getNodeId()).thenReturn(NodeId.newInstance("localhost", 0));
- when(context.getHttpPort()).thenReturn(0);
Configuration conf = new Configuration();
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org