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 f09f42eb12b..63761afc409 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 @@ -464,6 +464,30 @@ export default Ember.Component.extend({ return 'N/A'; } } + }, { + id: 'allocatedMB', + headerTitle: 'Allocated memory', + contentPath: 'allocatedMB', + getCellContent: function(row) { + var memory = row.get('allocatedMB'); + if (memory) { + return memory + " MB"; + } else { + return 'N/A'; + } + } + }, { + id: 'allocatedVCores', + headerTitle: 'Allocated VCores', + contentPath: 'allocatedVCores', + getCellContent: function(row) { + var vcores = row.get('allocatedVCores'); + if (vcores) { + return vcores; + } else { + return 'N/A'; + } + } }, { id: 'logUrl', headerTitle: 'Logs', 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 7482a2fe998..9384418d992 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 @@ -31,6 +31,7 @@ export default DS.Model.extend({ containerState: DS.attr('string'), nodeHttpAddress: DS.attr('string'), nodeId: DS.attr('string'), + diagnosticsInfo: DS.attr('string'), startTs: function() { return Converter.dateToTimeStamp(this.get("startedTime")); 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 132297261da..78f68794730 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 @@ -42,6 +42,7 @@ export default DS.JSONAPISerializer.extend({ 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, + diagnosticsInfo: payload.info.YARN_CONTAINER_DIAGNOSTICS_INFO, } }; 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 139b7eb9bec..0dc38d3331b 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 @@ -48,6 +48,18 @@ {{container.containerState}} {{/if}} + {{#if container.allocatedMB}} + + Allocated memory + {{container.allocatedMB}} MB + + {{/if}} + {{#if container.allocatedVCores}} + + Allocated virtual cores + {{container.allocatedVCores}} + + {{/if}} {{#if container.nodeHttpAddress}} NodeManager UI @@ -60,5 +72,11 @@ Link {{/if}} + {{#if container.diagnosticsInfo}} + + Diagnostics info +
{{container.diagnosticsInfo}}
+ + {{/if}}