From d3dc5ba02c8e78c4aab89bdb8d01d76392a5893f Mon Sep 17 00:00:00 2001
From: Sunil G
ElapsedTime:" + String(this.get("elapsedTime")) + "
"; }.property(), + + masterNodeURL: function() { + var addr = encodeURIComponent(this.get("nodeHttpAddress")); + return `#/yarn-node/${this.get("nodeId")}/${addr}/info/`; + }.property("nodeId", "nodeHttpAddress"), }); 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 dd95765719d..9ccf78f912b 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 @@ -140,4 +140,8 @@ export default DS.Model.extend({ return this.get("state"); }.property(), + masterNodeURL: function() { + var addr = encodeURIComponent(this.get("nodeHttpAddress")); + return `#/yarn-node/${this.get("nodeId")}/${addr}/info/`; + }.property("nodeId", "nodeHttpAddress"), }); 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 7f3934524e3..7482a2fe998 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 @@ -30,6 +30,7 @@ export default DS.Model.extend({ containerExitStatus: DS.attr('number'), containerState: DS.attr('string'), nodeHttpAddress: DS.attr('string'), + nodeId: DS.attr('string'), startTs: function() { return Converter.dateToTimeStamp(this.get("startedTime")); @@ -60,4 +61,9 @@ export default DS.Model.extend({ "ElapsedTime:" + String(this.get("elapsedTime")) + "
"; }.property(), + + masterNodeURL: function() { + var addr = encodeURIComponent(this.get("nodeHttpAddress")); + return `#/yarn-node/${this.get("nodeId")}/${addr}/info/`; + }.property("nodeId", "nodeHttpAddress"), }); 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 8ccff07de19..fc640c52e4e 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 @@ -36,6 +36,7 @@ export default DS.JSONAPISerializer.extend({ logUrl: payload.logUrl, containerExitStatus: payload.containerExitStatus, containerState: payload.containerState, + nodeId : payload.nodeId, nodeHttpAddress: payload.nodeHttpAddress } }; 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 0245b207ad6..24be33e0982 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 @@ -37,10 +37,10 @@ export default DS.JSONAPISerializer.extend({ finishedTime: Converter.timeStampToDate(finishedTime), containerId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_CONTAINER, amContainerId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_CONTAINER, - nodeHttpAddress: '', - nodeId: '', + nodeHttpAddress: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_NODE_ADDRESS, + nodeId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_NODE_ID, hosts: payload.info.YARN_APPLICATION_ATTEMPT_HOST, - state: payload.info.YARN_APPLICATION_ATTEMPT_HOST, + state: payload.info.YARN_APPLICATION_ATTEMPT_STATE, logsLink: '', appAttemptId: payload.id } 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 471f9105e93..132297261da 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 @@ -40,7 +40,8 @@ export default DS.JSONAPISerializer.extend({ finishedTime: Converter.timeStampToDate(payload.info.YARN_CONTAINER_FINISHED_TIME), nodeHttpAddress: payload.info.YARN_CONTAINER_ALLOCATED_HOST_HTTP_ADDRESS, containerExitStatus: payload.info.YARN_CONTAINER_EXIT_STATUS, - containerState: payload.info.YARN_CONTAINER_STATE + containerState: payload.info.YARN_CONTAINER_STATE, + nodeId: payload.info.YARN_CONTAINER_ALLOCATED_HOST + ':' + payload.info.YARN_CONTAINER_ALLOCATED_PORT, } }; return fixedPayload; 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 3860f1550c2..139b7eb9bec 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 @@ -51,7 +51,7 @@ {{#if container.nodeHttpAddress}}