Repository: hadoop Updated Branches: refs/heads/trunk 2499435d9 -> f82922dcf
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/UpdatedContainerInfo.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/rmnode/UpdatedContainerInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/UpdatedContainerInfo.java index 284b536..d55db68 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/UpdatedContainerInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/UpdatedContainerInfo.java @@ -19,20 +19,26 @@ package org.apache.hadoop.yarn.server.resourcemanager.rmnode; import java.util.List; +import java.util.Map; +import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ContainerStatus; public class UpdatedContainerInfo { private List<ContainerStatus> newlyLaunchedContainers; private List<ContainerStatus> completedContainers; + private List<Map.Entry<ApplicationId, ContainerStatus>> updateContainers; public UpdatedContainerInfo() { } - public UpdatedContainerInfo(List<ContainerStatus> newlyLaunchedContainers - , List<ContainerStatus> completedContainers) { + public UpdatedContainerInfo(List<ContainerStatus> newlyLaunchedContainers, + List<ContainerStatus> completedContainers, + List<Map.Entry<ApplicationId, ContainerStatus>> + updateContainers) { this.newlyLaunchedContainers = newlyLaunchedContainers; this.completedContainers = completedContainers; + this.updateContainers = updateContainers; } public List<ContainerStatus> getNewlyLaunchedContainers() { @@ -42,4 +48,8 @@ public class UpdatedContainerInfo { public List<ContainerStatus> getCompletedContainers() { return this.completedContainers; } + + public List<Map.Entry<ApplicationId, ContainerStatus>> getUpdateContainers() { + return this.updateContainers; + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.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/scheduler/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java index 7acedf2..8612e80 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.EnumSet; + import java.util.List; import java.util.Map; import java.util.Set; @@ -31,6 +32,8 @@ import java.util.TimerTask; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.ReentrantReadWriteLock; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; @@ -1008,11 +1011,14 @@ public abstract class AbstractYarnScheduler new ArrayList<>(); List<ContainerStatus> completedContainers = new ArrayList<>(); + List<Map.Entry<ApplicationId, ContainerStatus>> updateExistContainers = + new ArrayList<>(); for(UpdatedContainerInfo containerInfo : containerInfoList) { newlyLaunchedContainers .addAll(containerInfo.getNewlyLaunchedContainers()); completedContainers.addAll(containerInfo.getCompletedContainers()); + updateExistContainers.addAll(containerInfo.getUpdateContainers()); } // Processing the newly launched containers @@ -1028,6 +1034,30 @@ public abstract class AbstractYarnScheduler containerIncreasedOnNode(container.getId(), schedulerNode, container); } + // Processing the update exist containers + for (Map.Entry<ApplicationId, ContainerStatus> c : updateExistContainers) { + SchedulerApplication<T> app = applications.get(c.getKey()); + ContainerId containerId = c.getValue().getContainerId(); + String strExposedPorts = c.getValue().getExposedPorts(); + Map<String, List<Map<String, String>>> exposedPorts = null; + if (null != strExposedPorts && !strExposedPorts.isEmpty()) { + Gson gson = new Gson(); + exposedPorts = gson.fromJson(strExposedPorts, + new TypeToken<Map<String, List<Map<String, String>>>>() + {}.getType()); + } + + RMContainer rmContainer + = app.getCurrentAppAttempt().getRMContainer(containerId); + if (null != rmContainer && + (null == rmContainer.getExposedPorts() + || rmContainer.getExposedPorts().size() == 0)) { + LOG.info("update exist container " + containerId.getContainerId() + + ", strExposedPorts = " + strExposedPorts); + rmContainer.setExposedPorts(exposedPorts); + } + } + return completedContainers; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ContainerUpdateContext.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/scheduler/ContainerUpdateContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ContainerUpdateContext.java index 491a9ce..ab4fc1e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ContainerUpdateContext.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ContainerUpdateContext.java @@ -320,6 +320,8 @@ public class ContainerUpdateContext { updatedResource, existingRMContainer.getContainer().getPriority(), null, tempContainer.getExecutionType()); + newContainer.setExposedPorts( + existingRMContainer.getContainer().getExposedPorts()); newContainer.setAllocationRequestId( existingRMContainer.getContainer().getAllocationRequestId()); newContainer.setVersion(existingRMContainer.getContainer().getVersion()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptInfo.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/webapp/dao/AppAttemptInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptInfo.java index 22a9c33..b41dc6b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptInfo.java @@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; +import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; @@ -43,6 +44,7 @@ public class AppAttemptInfo { protected String blacklistedNodes; private String nodesBlacklistedBySystem; protected String appAttemptId; + private String exportPorts; public AppAttemptInfo() { } @@ -55,6 +57,7 @@ public class AppAttemptInfo { this.nodeId = ""; this.logsLink = ""; this.blacklistedNodes = ""; + this.exportPorts = ""; if (attempt != null) { this.id = attempt.getAppAttemptId().getAttemptId(); this.startTime = attempt.getStartTime(); @@ -68,6 +71,9 @@ public class AppAttemptInfo { + masterContainer.getNodeHttpAddress(), masterContainer.getId().toString(), user); + Gson gson = new Gson(); + this.exportPorts = gson.toJson(masterContainer.getExposedPorts()); + nodesBlacklistedBySystem = StringUtils.join(attempt.getAMBlacklistManager() .getBlacklistUpdates().getBlacklistAdditions(), ", "); http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java index 0784d1e..d95a4b1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java @@ -1449,7 +1449,8 @@ public class TestClientRMService { RMAppAttemptImpl rmAppAttemptImpl = spy(new RMAppAttemptImpl(attemptId, rmContext, yarnScheduler, null, asContext, config, null, app)); Container container = Container.newInstance( - ContainerId.newContainerId(attemptId, 1), null, "", null, null, null); + ContainerId.newContainerId(attemptId, 1), null, + "", null, null, null); RMContainerImpl containerimpl = spy(new RMContainerImpl(container, SchedulerRequestKey.extractFrom(container), attemptId, null, "", rmContext)); http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java index a84fdca..0793699 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java @@ -358,7 +358,8 @@ public class TestRMWebServicesAppAttempts extends JerseyTestBase { WebServicesTestUtils.getXmlString(element, "containerId"), WebServicesTestUtils.getXmlString(element, "nodeHttpAddress"), WebServicesTestUtils.getXmlString(element, "nodeId"), - WebServicesTestUtils.getXmlString(element, "logsLink"), user); + WebServicesTestUtils.getXmlString(element, "logsLink"), user, + WebServicesTestUtils.getXmlString(element, "exportPorts")); } } @@ -366,18 +367,17 @@ public class TestRMWebServicesAppAttempts extends JerseyTestBase { String user) throws Exception { - assertEquals("incorrect number of elements", 10, info.length()); + assertEquals("incorrect number of elements", 11, info.length()); verifyAppAttemptInfoGeneric(appAttempt, info.getInt("id"), info.getLong("startTime"), info.getString("containerId"), info.getString("nodeHttpAddress"), info.getString("nodeId"), - info.getString("logsLink"), user); + info.getString("logsLink"), user, info.getString("exportPorts")); } private void verifyAppAttemptInfoGeneric(RMAppAttempt appAttempt, int id, long startTime, String containerId, String nodeHttpAddress, String - nodeId, - String logsLink, String user) { + nodeId, String logsLink, String user, String exportPorts) { assertEquals("id doesn't match", appAttempt.getAppAttemptId() .getAttemptId(), id); http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js index 70f5898..b4de94f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js @@ -377,6 +377,18 @@ export default Ember.Component.extend({ } } }, { + id: 'exposedPorts', + headerTitle: 'Exposed Ports', + contentPath: 'exposedPorts', + getCellContent: function(row) { + var ports = row.get('exposedPorts'); + if (ports) { + return ports; + } else { + return 'N/A'; + } + } + }, { id: 'nodeHttpAddress', headerTitle: 'NodeManager Web UI', contentPath: 'nodeHttpAddress', @@ -486,6 +498,18 @@ export default Ember.Component.extend({ } } }, { + id: 'exposedPorts', + headerTitle: 'Exposed Ports', + contentPath: 'exposedPorts', + getCellContent: function(row) { + var ports = row.get('exposedPorts'); + if (ports) { + return ports; + } else { + return 'N/A'; + } + } + }, { id: 'nodeHttpAddress', headerTitle: 'Node Manager UI', contentPath: 'nodeHttpAddress', http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js index f483695..6538f20 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js @@ -27,6 +27,7 @@ export default DS.Model.extend({ containerId: DS.attr('string'), amContainerId: DS.attr('string'), nodeHttpAddress: DS.attr('string'), + exposedPorts: DS.attr('string'), nodeId: DS.attr('string'), hosts: DS.attr('string'), logsLink: DS.attr('string'), http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-component-instance.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-component-instance.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-component-instance.js index e4b6a9b..710a26d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-component-instance.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-component-instance.js @@ -31,6 +31,7 @@ export default DS.Model.extend({ node: DS.attr('string'), hostUrl: DS.attr('string'), ipAddr: DS.attr('string'), + exposedPorts: DS.attr('string'), exitStatusCode: DS.attr('string'), createdDate: Ember.computed('createdTimestamp', function() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js index c313f02..f13c405 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js @@ -30,6 +30,7 @@ export default DS.Model.extend({ containerExitStatus: DS.attr('number'), containerState: DS.attr('string'), nodeHttpAddress: DS.attr('string'), + exposedPorts: DS.attr('string'), nodeId: DS.attr('string'), startTs: function() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js index 9ccf78f..f0fb537 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js @@ -32,6 +32,7 @@ export default DS.Model.extend({ logsLink: DS.attr('string'), state: DS.attr('string'), appAttemptId: DS.attr('string'), + exposedPorts: DS.attr('string'), appId: Ember.computed("id",function () { var id = this.get("id"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js index 8958591..104c1a9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js @@ -32,6 +32,7 @@ export default DS.Model.extend({ nodeHttpAddress: DS.attr('string'), nodeId: DS.attr('string'), diagnosticsInfo: DS.attr('string'), + exposedPorts: DS.attr('string'), startTs: function() { return Converter.dateToTimeStamp(this.get("startedTime")); http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js index 55f484b..8a77c67 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js @@ -36,6 +36,7 @@ export default DS.JSONAPISerializer.extend({ containerId: payload.containerId, amContainerId: payload.amContainerId, nodeHttpAddress: payload.nodeHttpAddress, + exposedPorts: payload.exposedPorts, nodeId: payload.nodeId, hosts: payload.host, state: payload.appAttemptState, http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js index ce0dfb0..9ee4a6e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js @@ -35,6 +35,7 @@ export default DS.JSONAPISerializer.extend({ host: info.HOSTNAME, node: info.BARE_HOST, ipAddr: info.IP, + exposedPorts: info.EXPOSED_PORTS, exitStatusCode: info.EXIT_STATUS_CODE } }; http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js index f7f8272..73b5919 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js @@ -37,7 +37,8 @@ export default DS.JSONAPISerializer.extend({ containerExitStatus: payload.containerExitStatus + '', containerState: payload.containerState, nodeId : payload.nodeId, - nodeHttpAddress: payload.nodeHttpAddress + nodeHttpAddress: payload.nodeHttpAddress, + exposedPorts: payload.exposedPorts } }; http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js index 24be33e..d6e94a0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js @@ -38,6 +38,7 @@ export default DS.JSONAPISerializer.extend({ containerId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_CONTAINER, amContainerId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_CONTAINER, nodeHttpAddress: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_NODE_ADDRESS, + exposedPorts: payload.info.YARN_CONTAINER_ALLOCATED_EXPOSED_PORTS, nodeId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_NODE_ID, hosts: payload.info.YARN_APPLICATION_ATTEMPT_HOST, state: payload.info.YARN_APPLICATION_ATTEMPT_STATE, http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js index 5b62b2f..82b5e57 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js @@ -34,6 +34,7 @@ export default DS.JSONAPISerializer.extend({ startedTime: Converter.timeStampToDate(payload.createdtime), finishedTime: Converter.timeStampToDate(payload.info.YARN_CONTAINER_FINISHED_TIME), nodeHttpAddress: payload.info.YARN_CONTAINER_ALLOCATED_HOST_HTTP_ADDRESS, + exposedPorts: payload.info.YARN_CONTAINER_ALLOCATED_EXPOSED_PORTS, containerExitStatus: payload.info.YARN_CONTAINER_EXIT_STATUS + '', containerState: payload.info.YARN_CONTAINER_STATE, nodeId: payload.info.YARN_CONTAINER_ALLOCATED_HOST + ':' + payload.info.YARN_CONTAINER_ALLOCATED_PORT, http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs index dc0397a..06dd754 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs @@ -56,6 +56,12 @@ <td title="{{attempt.nodeHttpAddress}}"><a href="{{attempt.masterNodeURL}}">{{attempt.nodeHttpAddress}}</a></td> </tr> {{/if}} + {{#if attempt.exposedPorts}} + <tr> + <td>Exposed Ports</td> + <td title="{{attempt.exposedPorts}}">{{attempt.exposedPorts}}</td> + </tr> + {{/if}} {{#if attempt.logsLink}} <tr> <td>Log</td> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs index 935cf94..9bdabec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs @@ -54,6 +54,12 @@ <td title="{{container.nodeHttpAddress}}"><a href="{{container.masterNodeURL}}">{{container.nodeHttpAddress}}</a></td> </tr> {{/if}} + {{#if container.exposedPorts}} + <tr> + <td>Exposed Ports</td> + <td title="{{container.exposedPorts}}">{{container.exposedPorts}}</td> + </tr> + {{/if}} {{#if container.logUrl}} <tr> <td>Log</td> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f82922dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs index c9157b8..f915642 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs @@ -58,6 +58,10 @@ <td>{{check-availability model.container.ipAddr}}</td> </tr> <tr> + <td>Exposed Ports</td> + <td>{{check-availability model.container.exposedPorts}}</td> + </tr> + <tr> <td>Exit Status Code</td> <td>{{check-availability model.container.exitStatusCode}}</td> </tr> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
