You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2016/07/06 01:31:14 UTC
ambari git commit: AMBARI-17574 - YARN Summary Panel shows
ResourceManager heap incorrectly (rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk c6d15394a -> 36a3848c7
AMBARI-17574 - YARN Summary Panel shows ResourceManager heap incorrectly (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/36a3848c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/36a3848c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/36a3848c
Branch: refs/heads/trunk
Commit: 36a3848c768a1638a6893bddd26390645bd9245f
Parents: c6d1539
Author: Richard Zang <rz...@apache.org>
Authored: Tue Jul 5 18:17:58 2016 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Tue Jul 5 18:26:12 2016 -0700
----------------------------------------------------------------------
ambari-web/app/messages.js | 1 +
ambari-web/app/views/main/service/services/yarn.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/36a3848c/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 888aa52..0e38171 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2753,6 +2753,7 @@ Em.I18n.translations = {
'dashboard.services.yarn.resourceManager':'ResourceManager',
'dashboard.services.yarn.nodeManagers':'NodeManagers',
'dashboard.services.yarn.nodeManager':'NodeManager',
+ 'dashboard.services.yarn.nodes.heapUsed':'{0} / {1} ({2}% used)',
'dashboard.services.yarn.clients':'YARN Clients',
'dashboard.services.yarn.client':'YARN Client',
'dashboard.services.yarn.resourceManager.uptime':'ResourceManager Uptime',
http://git-wip-us.apache.org/repos/asf/ambari/blob/36a3848c/ambari-web/app/views/main/service/services/yarn.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/services/yarn.js b/ambari-web/app/views/main/service/services/yarn.js
index 7ccbfcf..cf8adeb 100644
--- a/ambari-web/app/views/main/service/services/yarn.js
+++ b/ambari-web/app/views/main/service/services/yarn.js
@@ -23,7 +23,7 @@ App.MainDashboardServiceYARNView = App.MainDashboardServiceView.extend({
templateName: require('templates/main/service/services/yarn'),
serviceName: 'YARN',
- nodeHeap: App.MainDashboardServiceView.formattedHeap('dashboard.services.yarn.summary', 'service.jvmMemoryHeapUsed', 'service.jvmMemoryHeapMax'),
+ nodeHeap: App.MainDashboardServiceView.formattedHeap('dashboard.services.yarn.nodes.heapUsed', 'service.jvmMemoryHeapUsed', 'service.jvmMemoryHeapMax'),
nodeManagerComponent: Em.Object.create({
componentName: 'NODEMANAGER'