You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by pb...@apache.org on 2021/02/22 11:56:01 UTC
[hadoop] branch trunk updated: YARN-10513. CS Flexible Auto Queue
Creation RM UIv2 modifications. Contributed by Andras Gyori.
This is an automated email from the ASF dual-hosted git repository.
pbacsko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new b722c52 YARN-10513. CS Flexible Auto Queue Creation RM UIv2 modifications. Contributed by Andras Gyori.
b722c52 is described below
commit b722c52f4ede4c19c76a7947583fd6104e2c908a
Author: Peter Bacsko <pb...@cloudera.com>
AuthorDate: Mon Feb 22 12:55:45 2021 +0100
YARN-10513. CS Flexible Auto Queue Creation RM UIv2 modifications. Contributed by Andras Gyori.
---
.../yarn-queue-partition-capacity-labels.js | 14 ++++++++-
.../webapp/app/models/yarn-queue/capacity-queue.js | 13 ++++++++
.../app/serializers/yarn-queue/capacity-queue.js | 5 +++
.../yarn-queue-partition-capacity-labels.hbs | 22 ++++++++++++-
.../src/main/webapp/app/templates/yarn-queue.hbs | 36 +++++++++++++++++-----
5 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js
index e7f9c03..788155c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js
@@ -37,12 +37,24 @@ export default Ember.Component.extend({
const userLimit = queue.get("userLimit");
const userLimitFactor = queue.get("userLimitFactor");
const isLeafQueue = queue.get("isLeafQueue");
+ const isWeightMode = queue.get("isWeightMode");
+ const isFlexibleDynamicQueue = queue.get("isFlexibleDynamicQueue");
+ const weight = queue.get("weight");
+ const orderingPolicy = queue.get("orderingPolicy");
+ const normalizedWeight = queue.get("normalizedWeight");
+ const creationMethod = queue.get("creationMethod");
return {
...partitionMap[filteredParition],
userLimit,
userLimitFactor,
- isLeafQueue
+ isLeafQueue,
+ isWeightMode,
+ weight,
+ normalizedWeight,
+ orderingPolicy,
+ creationMethod,
+ isFlexibleDynamicQueue
};
}
});
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js
index ebcccb9..885c6a5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js
@@ -21,6 +21,7 @@ import Converter from 'yarn-ui/utils/converter';
export default DS.Model.extend({
name: DS.attr("string"),
+ path: DS.attr("string"),
children: DS.attr("array"),
parent: DS.attr("string"),
capacity: DS.attr("number"),
@@ -31,6 +32,10 @@ export default DS.Model.extend({
absCapacity: DS.attr("number"),
absMaxCapacity: DS.attr("number"),
absUsedCapacity: DS.attr("number"),
+ weight: DS.attr("number"),
+ normalizedWeight: DS.attr("number"),
+ creationMethod: DS.attr("string"),
+ orderingPolicy: DS.attr("string"),
state: DS.attr("string"),
userLimit: DS.attr("number"),
userLimitFactor: DS.attr("number"),
@@ -49,6 +54,14 @@ export default DS.Model.extend({
return len <= 0;
}.property("children"),
+ isWeightMode: function() {
+ return this.get("weight") !== -1;
+ }.property("children"),
+
+ isFlexibleDynamicQueue: function() {
+ return this.get("creationMethod") === "dynamicFlexible";
+ }.property("children"),
+
capacitiesBarChartData: function() {
var floatToFixed = Converter.floatToFixed;
return [
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js
index 2dec520..e9ce25d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js
@@ -92,6 +92,7 @@ export default DS.JSONAPISerializer.extend({
type: primaryModelClass.modelName, // yarn-queue
attributes: {
name: payload.queueName,
+ path: payload.queuePath,
parent: payload.myParent,
children: children,
capacity: payload.capacity,
@@ -100,7 +101,11 @@ export default DS.JSONAPISerializer.extend({
absCapacity: payload.absoluteCapacity,
absMaxCapacity: payload.absoluteMaxCapacity,
absUsedCapacity: payload.absoluteUsedCapacity,
+ weight: payload.weight,
+ normalizedWeight: payload.normalizedWeight,
+ creationMethod: payload.creationMethod,
state: payload.state,
+ orderingPolicy: payload.orderingPolicyInfo,
userLimit: payload.userLimit,
userLimitFactor: payload.userLimitFactor,
preemptionDisabled: payload.preemptionDisabled,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs
index fdecb2d..a84538d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs
@@ -30,6 +30,18 @@
<span class="label-value">{{data.absoluteMaxCapacity}}%</span>
</span>
</div>
+{{#if data.isWeightMode}}
+<div class="top-1">
+ <span class="yarn-label secondary">
+ <span class="label-key">weight</span>
+ <span class="label-value">{{data.weight}}</span>
+ </span>
+ <span class="yarn-label secondary">
+ <span class="label-key">normalized weight</span>
+ <span class="label-value">{{data.normalizedWeight}}</span>
+ </span>
+</div>
+{{else}}
<div class="top-1">
<span class="yarn-label secondary">
<span class="label-key">configured capacity</span>
@@ -40,6 +52,7 @@
<span class="label-value">{{data.maxCapacity}}%</span>
</span>
</div>
+{{/if}}
{{#if data.isLeafQueue}}
<div class="top-1">
<span class="yarn-label secondary">
@@ -51,4 +64,11 @@
<span class="label-value">{{data.userLimitFactor}}</span>
</span>
</div>
-{{/if}}
\ No newline at end of file
+{{/if}}
+{{#if data.isFlexibleDynamicQueue}}
+<div class="top-1">
+ <span class="yarn-label secondary">
+ <span class="label-key">flexible dynamic queue</span>
+ </span>
+</div>
+{{/if}}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
index 8024ffa..b65a3be 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
@@ -31,14 +31,34 @@
{{/if}}
{{#if (eq model.queues.firstObject.type "capacity")}}
<div class="top-1">
- <span class="yarn-label secondary">
- <span class="label-key">configured capacity</span>
- <span class="label-value">{{model.selectedQueue.capacity}}%</span>
- </span>
- <span class="yarn-label secondary">
- <span class="label-key">configured max capacity</span>
- <span class="label-value">{{model.selectedQueue.maxCapacity}}%</span>
- </span>
+ {{#if model.selectedQueue.isWeightMode}}
+ <span class="yarn-label secondary">
+ <span class="label-key">weight</span>
+ <span class="label-value">{{model.selectedQueue.weight}}</span>
+ </span>
+ <span class="yarn-label secondary">
+ <span class="label-key">normalized weight</span>
+ <span class="label-value">{{model.selectedQueue.normalizedWeight}}</span>
+ </span>
+ {{else}}
+ <span class="yarn-label secondary">
+ <span class="label-key">configured capacity</span>
+ <span class="label-value">{{model.selectedQueue.capacity}}%</span>
+ </span>
+ <span class="yarn-label secondary">
+ <span class="label-key">configured max capacity</span>
+ <span class="label-value">{{model.selectedQueue.maxCapacity}}%</span>
+ </span>
+ {{/if}}
+ <span class="yarn-label secondary">
+ <span class="label-key">ordering policy</span>
+ <span class="label-value">{{model.selectedQueue.orderingPolicy}}</span>
+ </span>
+ {{#if model.selectedQueue.isFlexibleDynamicQueue}}
+ <span class="yarn-label secondary">
+ <span class="label-key">flexible dynamic queue</span>
+ </span>
+ {{/if}}
{{#if model.selectedQueue.isLeafQueue}}
<span class="yarn-label secondary">
<span class="label-key">user limit</span>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org