From ca6ed476d2c4bece1d6b6b435b19919dea973cec Mon Sep 17 00:00:00 2001 From: Vasu Date: Wed, 8 Nov 2017 15:21:29 +0530 Subject: [PATCH] REnder outstanding resoource requets on App details --- .gitignore | 1 + .../src/main/webapp/app/models/yarn-app.js | 1 + .../src/main/webapp/app/serializers/yarn-app.js | 1 + .../main/webapp/app/templates/yarn-app/info.hbs | 37 ++++++++++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/.gitignore b/.gitignore index 724162d770e..70c1f231165 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/dist hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/tmp yarnregistry.pdf patchprocess/ +.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..f60bef6000d 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,43 @@ {{/if}} +{{#unless model.serviceName}} +
+
+
+
Outstanding resource requests
+ + + + + + + + + + + + + + + {{#each model.app.resourceRequests as |request|}} + + + + + + + {{else}} + No data available! + {{/each}} + + +
PriorityResourceNameCapabilityNumContainersRelaxLocalityNodeLabelExpression
{{request.priority.priority}}{{request.resourceName}}<Memory:{{request.capability.memory}};vCores:{{request.capability.virtualCores}}>{{request.numContainers}}{{request.relaxLocality}}{{request.nodeLabelExpression}}
+
+
+
+{{/unless}}
-- 2.13.5 (Apple Git-94)