From 1ce7aab59374b7bdee8c4801b0ac4a3a77326abe Mon Sep 17 00:00:00 2001 From: Vasu Date: Wed, 8 Nov 2017 15:21:29 +0530 Subject: [PATCH 1/3] REnder outstanding resoource requets on App details --- .../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 | 42 ++++++++++++++++++++++ 3 files changed, 44 insertions(+) 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..c31963dccb6 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}} +
+
+
+
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}} + {{#if request.nodeLabelExpression}} + {{request.nodeLabelExpression}} + {{else}} + N/A + {{/if}} +
+
+
+
+{{/unless}}
-- 2.13.5 (Apple Git-94) From 8b8551fdce5ad51637749c53567b0b75198352bc Mon Sep 17 00:00:00 2001 From: Vasu Date: Tue, 14 Nov 2017 11:29:49 +0530 Subject: [PATCH 2/3] Copy changes to resource requests table --- .gitignore | 4 +--- .../src/main/webapp/app/templates/yarn-app/info.hbs | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) 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/templates/yarn-app/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs index c31963dccb6..8cd5bfd28c6 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 @@ -136,17 +136,17 @@
-
Outstanding resource requests
+
Outstanding Resource Requests
- - + + - - - + + + @@ -166,7 +166,7 @@ {{else}} - No data available! + No data available! {{/each}}
PriorityResourceNameScheduler KeyResource Name CapabilityNumContainersRelaxLocalityNodeLabelExpression# ContainersRelax LocalityNode Label Expression
-- 2.13.5 (Apple Git-94) From 05b62d465c64ccda3966b750d8b3dadba8f0076a Mon Sep 17 00:00:00 2001 From: Vasu Date: Tue, 14 Nov 2017 14:31:50 +0530 Subject: [PATCH 3/3] Fix v3 compatibitity issue --- .../hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 8cd5bfd28c6..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 @@ -152,7 +152,7 @@ {{#each model.app.resourceRequests as |request|}} - {{request.priority.priority}} + {{request.priority}} {{request.resourceName}} <Memory:{{request.capability.memory}};vCores:{{request.capability.virtualCores}}> {{request.numContainers}} @@ -166,7 +166,7 @@ {{else}} - No data available! +
No data available!
{{/each}} -- 2.13.5 (Apple Git-94)