Updated Branches: refs/heads/trunk 0db94b814 -> bf1789f25
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/bf1789f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/bf1789f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/bf1789f2 Branch: refs/heads/trunk Commit: bf1789f25f7d168e6bd5d64dbda8c4c8383c5f8c Parents: 0db94b8 Author: Srimanth Gunturi <[email protected]> Authored: Mon Nov 4 16:19:34 2013 -0800 Committer: Srimanth Gunturi <[email protected]> Committed: Mon Nov 4 16:26:15 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/bf1789f2/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);
