ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sangee...@apache.org
Subject ambari git commit: AMBARI-19451: When defining yarn.scheduler.capacity.<queue-path>.accessible-node-labels with space, Yarn Queue Manager shows error for the queue (sangeetar)
Date Mon, 16 Jan 2017 21:11:06 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 43f8f73ee -> f90599ad3


AMBARI-19451: When defining yarn.scheduler.capacity.<queue-path>.accessible-node-labels
with space, Yarn Queue Manager shows error for the queue (sangeetar)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f90599ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f90599ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f90599ad

Branch: refs/heads/branch-2.5
Commit: f90599ad3f43a835bbb8114d339ab8a6af4a7f1f
Parents: 43f8f73
Author: Sangeeta Ravindran <sangeetar@apache.org>
Authored: Mon Jan 16 13:10:41 2017 -0800
Committer: Sangeeta Ravindran <sangeetar@apache.org>
Committed: Mon Jan 16 13:10:41 2017 -0800

----------------------------------------------------------------------
 .../capacity-scheduler/src/main/resources/ui/app/serializers.js    | 2 +-
 .../main/resources/ui/app/templates/components/queueContainer.hbs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f90599ad/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
----------------------------------------------------------------------
diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js b/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
index de19cc9..940d0f8 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
@@ -113,7 +113,7 @@ App.SerializerMixin = Em.Mixin.create({
     q.capacity = (props[base_path + ".capacity"])? +parseFloat(props[base_path + ".capacity"]).toFixed(2)
: null;
     q.maximum_capacity = (props[base_path + ".maximum-capacity"])? +parseFloat(props[base_path
+ ".maximum-capacity"]).toFixed(2) : null;
 
-    switch ((props.hasOwnProperty(labelsPath))?props[labelsPath]:'') {
+    switch ((props.hasOwnProperty(labelsPath))?props[labelsPath].trim():'') {
       case '*':
         q.labels = this.get('store.nodeLabels.content').map(function(item) {
           return [q.id,item.name].join('.');

http://git-wip-us.apache.org/repos/asf/ambari/blob/f90599ad/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
index 453bbbc..25ac2a1 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
@@ -68,7 +68,7 @@
               {{#if label.store.isRmOffline}}
                 <small>Unable to obtain information  about node label from the resource
manager</small>
               {{else}}
-                <small>Label is not exist on cluster</small>
+                <small>Label does not exist on cluster</small>
               {{/if}}
             {{else}}
               <span {{bind-attr class=":label label.overCapacity:label-danger:label-success"}}>{{label.name}}</span>


Mime
View raw message