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 2014/04/14 09:19:00 UTC
[2/2] git commit: AMBARI-5455. Ambari configuration for map join
conversion and tez container size seems wrong. (srimanth)
AMBARI-5455. Ambari configuration for map join conversion and tez container size seems wrong. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/864fae63
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/864fae63
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/864fae63
Branch: refs/heads/trunk
Commit: 864fae63f2488d8294dc1b6379b632294bf6fe0e
Parents: 1c9d494
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Sun Apr 13 22:04:46 2014 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Mon Apr 14 00:15:42 2014 -0700
----------------------------------------------------------------------
.../configs/defaults_providers/hive_defaults_provider.js | 11 ++++++++---
.../utils/configs/validators/hive_configs_validator.js | 10 ++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/864fae63/ambari-web/app/utils/configs/defaults_providers/hive_defaults_provider.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/defaults_providers/hive_defaults_provider.js b/ambari-web/app/utils/configs/defaults_providers/hive_defaults_provider.js
index 7530041..fda9f56 100644
--- a/ambari-web/app/utils/configs/defaults_providers/hive_defaults_provider.js
+++ b/ambari-web/app/utils/configs/defaults_providers/hive_defaults_provider.js
@@ -21,15 +21,20 @@ require('utils/configs/defaults_providers/yarn_defaults_provider');
App.HiveDefaultsProvider = App.YARNDefaultsProvider.extend({
configsTemplate: {
- 'hive.tez.container.size': null
+ 'hive.tez.container.size': null,
+ 'hive.tez.java.opts': null,
+ 'hive.auto.convert.join.noconditionaltask.size': null
},
getDefaults : function(localDB) {
var configs = this._super(localDB);
if (configs['yarn.scheduler.maximum-allocation-mb'] != null && configs['mapreduce.map.memory.mb'] != null
&& configs['mapreduce.reduce.memory.mb'] != null) {
- var containerSize = configs['mapreduce.map.memory.mb'] >= 2048 ? configs['mapreduce.map.memory.mb'] : configs['mapreduce.reduce.memory.mb'];
- configs['hive.tez.container.size'] = Math.min(configs['yarn.scheduler.maximum-allocation-mb'], containerSize);
+ var containerSize = configs['mapreduce.map.memory.mb'] > 2048 ? configs['mapreduce.map.memory.mb'] : configs['mapreduce.reduce.memory.mb'];
+ containerSize = Math.min(configs['yarn.scheduler.maximum-allocation-mb'], containerSize);
+ configs['hive.auto.convert.join.noconditionaltask.size'] = Math.round(containerSize / 3) * 1048576; // MB to Bytes
+ configs['hive.tez.java.opts'] = "-server -Xmx"+containerSize+"m -Djava.net.preferIPv4Stack=true";
+ configs['hive.tez.container.size'] = containerSize;
} else {
jQuery.extend(configs, this.get('configsTemplate'));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/864fae63/ambari-web/app/utils/configs/validators/hive_configs_validator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/validators/hive_configs_validator.js b/ambari-web/app/utils/configs/validators/hive_configs_validator.js
index 8323d38..5eb048d 100644
--- a/ambari-web/app/utils/configs/validators/hive_configs_validator.js
+++ b/ambari-web/app/utils/configs/validators/hive_configs_validator.js
@@ -24,9 +24,19 @@ App.HiveConfigsValidator = App.ServiceConfigsValidator.create({
*/
configValidators: {
'hive.tez.container.size': 'hiveTezContainerMb',
+ 'hive.tez.java.opts': 'hiveTezJavaOpts',
+ 'hive.auto.convert.join.noconditionaltask.size': 'hiveTezJoinNoConditionalBytes'
},
hiveTezContainerMb: function(config) {
return this.validatorLessThenDefaultValue(config);
+ },
+
+ hiveTezJavaOpts: function(config) {
+ return this.validateXmxValue(config);
+ },
+
+ hiveTezJoinNoConditionalBytes: function(config) {
+ return this.validatorLessThenDefaultValue(config);
}
});