You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2013/11/08 14:21:15 UTC
git commit: AMBARI-3721 Yarn Memory graph goes over 100%. (ababiichuk)
Updated Branches:
refs/heads/trunk 62a75007f -> dace05a7c
AMBARI-3721 Yarn Memory graph goes over 100%. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/dace05a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/dace05a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/dace05a7
Branch: refs/heads/trunk
Commit: dace05a7c59210422fb70c701380d19ca4a7eb1b
Parents: 62a7500
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Nov 8 15:16:01 2013 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Nov 8 15:16:01 2013 +0200
----------------------------------------------------------------------
ambari-web/app/models/service/yarn.js | 4 ++++
ambari-web/app/views/main/dashboard/widgets/yarn_memory.js | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/dace05a7/ambari-web/app/models/service/yarn.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service/yarn.js b/ambari-web/app/models/service/yarn.js
index b9c7016..db0e625 100644
--- a/ambari-web/app/models/service/yarn.js
+++ b/ambari-web/app/models/service/yarn.js
@@ -58,6 +58,10 @@ App.YARNService = App.Service.extend({
* Provides a flat array of queue names.
* Example: root, root/default
*/
+ maxMemory: function() {
+ return this.get('allocatedMemory') + this.get('availableMemory');
+ }.property('allocatedMemory','availableMemory'),
+
queueNames: function () {
var queueString = this.get('queue');
var allQueueNames = [];
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/dace05a7/ambari-web/app/views/main/dashboard/widgets/yarn_memory.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/dashboard/widgets/yarn_memory.js b/ambari-web/app/views/main/dashboard/widgets/yarn_memory.js
index 0df7ab9..c96cf47 100644
--- a/ambari-web/app/views/main/dashboard/widgets/yarn_memory.js
+++ b/ambari-web/app/views/main/dashboard/widgets/yarn_memory.js
@@ -27,7 +27,7 @@ App.YARNMemoryPieChartView = App.PieChartDashboardWidgetView.extend({
widgetHtmlId: 'widget-yarn-memory',
model_type: 'yarn',
modelFieldUsed: 'allocatedMemory',
- modelFieldMax: 'availableMemory',
+ modelFieldMax: 'maxMemory',
didInsertElement: function() {
this._super();