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:13 UTC

[17/20] git commit: AMBARI-3719. YARN default number of containers calculation skewed towards heavier resources. (srimanth)

AMBARI-3719. YARN default number of containers calculation skewed towards heavier resources. (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/4ff28653
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/4ff28653
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/4ff28653

Branch: refs/heads/branch-1.4-bk
Commit: 4ff28653bcd22859974d412d4d88c46f0255dcfb
Parents: 3bd4b53
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Thu Nov 7 14:29:45 2013 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Thu Nov 7 14:32:44 2013 -0800

----------------------------------------------------------------------
 .../app/utils/configs/defaults_providers/yarn_defaults_provider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4ff28653/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js b/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js
index a263602..7a37f0b 100644
--- a/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js
+++ b/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js
@@ -106,7 +106,7 @@ App.YARNDefaultsProvider = App.DefaultsProvider.create({
     }
     ram *= this.get('GB');
     ram /= containerSize;
-    return Math.round(Math.max(cpu, Math.min(disk, ram)));
+    return Math.round(Math.min(cpu, Math.min(disk, ram)));
   }.property('clusterData.cpu', 'clusterData.ram', 'clusterData.hBaseInstalled', 'clusterData.disk', 'reservedRam', 'hBaseRam', 'recommendedMinimumContainerSize'),
 
   /**