You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2013/11/13 19:55:07 UTC
[11/20] git commit: AMBARI-3687. Default YARN/MR2 AM mem defaults are
empty. (srimanth)
AMBARI-3687. Default YARN/MR2 AM mem defaults are empty. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/0ae51790
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/0ae51790
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/0ae51790
Branch: refs/heads/branch-1.4-bk
Commit: 0ae517904cfe2574a78c2147ca67c68a6ae33b65
Parents: 2204615
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Mon Nov 4 16:19:34 2013 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Tue Nov 5 12:52:33 2013 -0800
----------------------------------------------------------------------
.../app/utils/defaults_providers/yarn_defaults_provider.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0ae51790/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js b/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js
index 80732cb..9e83949 100644
--- a/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js
+++ b/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js
@@ -133,7 +133,7 @@ App.YARNDefaultsProvider = App.DefaultsProvider.create({
return ramPerContainer <= 2048 ? 2 * ramPerContainer : ramPerContainer;
}.property('ramPerContainer'),
- amMemeory: function () {
+ amMemory: function () {
return Math.max(this.get('mapMemory'), this.get('reduceMemory'));
}.property('mapMemory', 'reduceMemory'),
@@ -262,11 +262,11 @@ App.YARNDefaultsProvider = App.DefaultsProvider.create({
var host = hosts[0] && localDB.hosts[hosts[0]];
if (host) {
clusterData.cpu = parseInt(host.cpu);
- invalidMountPoints= ['/homes/','/dev/','/tmp/'];
var length = 0;
host.disk_info.forEach(function(disk) {
//invalid mountpoints
- if (!(disk.mountpoint.startsWith('/homes/') || disk.mountpoint.startsWith('/dev/') || disk.mountpoint.startsWith('/tmp/'))) {
+ if (!(disk.mountpoint.startsWith('/home/') || disk.mountpoint.startsWith('/homes/') ||
+ disk.mountpoint.startsWith('/dev/') || disk.mountpoint.startsWith('/tmp/'))) {
length++;
}
},this);