ambari git commit: AMBARI-19451: When defining yarn.scheduler.capacity..accessible-node-labels with space, Yarn Queue Manager shows error for the queue (sangeetar)
Repository: ambari Updated Branches: refs/heads/trunk 54db4072e -> e0552d62e AMBARI-19451: When defining yarn.scheduler.capacity..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/e0552d62 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e0552d62 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e0552d62 Branch: refs/heads/trunk Commit: e0552d62e8229ee2cbbca216c491e3234b624d4d Parents: 54db407 Author: Sangeeta Ravindran Authored: Mon Jan 16 14:12:06 2017 -0800 Committer: Sangeeta Ravindran Committed: Mon Jan 16 14:12:06 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/e0552d62/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/e0552d62/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}} Unable to obtain information about node label from the resource manager {{else}} -Label is not exist on cluster +Label does not exist on cluster {{/if}} {{else}} {{label.name}}
ambari git commit: AMBARI-19451: When defining yarn.scheduler.capacity..accessible-node-labels with space, Yarn Queue Manager shows error for the queue (sangeetar)
Repository: ambari Updated Branches: refs/heads/branch-2.5 43f8f73ee -> f90599ad3 AMBARI-19451: When defining yarn.scheduler.capacity..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 Authored: Mon Jan 16 13:10:41 2017 -0800 Committer: Sangeeta Ravindran 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}} Unable to obtain information about node label from the resource manager {{else}} -Label is not exist on cluster +Label does not exist on cluster {{/if}} {{else}} {{label.name}}