diff --git a/.gitignore b/.gitignore index 817556f92dc..70c1f231165 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,4 @@ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/dist hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/tmp yarnregistry.pdf patchprocess/ - - -.history/ \ No newline at end of file +.history/ diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js index 47814e48c2b..853e2ee144a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js @@ -52,6 +52,7 @@ export default DS.Model.extend({ currentAppAttemptId: DS.attr('string'), remainingTimeoutInSeconds: DS.attr('number'), applicationExpiryTime: DS.attr('string'), + resourceRequests: DS.attr('array'), isFailed: function() { return this.get('finalStatus') === "FAILED"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js index 1462f5aa085..efdb1ba638f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js @@ -58,6 +58,7 @@ export default DS.JSONAPISerializer.extend({ allocatedMB: payload.allocatedMB, allocatedVCores: payload.allocatedVCores, runningContainers: payload.runningContainers, + resourceRequests: payload.resourceRequests, memorySeconds: payload.memorySeconds, vcoreSeconds: payload.vcoreSeconds, preemptedResourceMB: payload.preemptedResourceMB, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs index 534869e2ec2..6b06961908b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs @@ -132,6 +132,48 @@ {{/if}} +{{#unless model.serviceName}} +
Scheduler Key | +Resource Name | +Capability | +# Containers | +Relax Locality | +Node Label Expression | +
---|---|---|---|---|---|
{{request.priority}} | +{{request.resourceName}} | +<Memory:{{request.capability.memory}};vCores:{{request.capability.virtualCores}}> | +{{request.numContainers}} | +{{request.relaxLocality}} | ++ {{#if request.nodeLabelExpression}} + {{request.nodeLabelExpression}} + {{else}} + N/A + {{/if}} + | +