Repository: ambari Updated Branches: refs/heads/trunk 48ca3fe0b -> b7c9651ec
AMBARI-5768. Create a different global for hive heapsize -> hive_heapsize for hive-env.sh.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7c9651e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7c9651e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7c9651e Branch: refs/heads/trunk Commit: b7c9651ec15ea6ddec8fb634caabbb4bea8b6164 Parents: 48ca3fe Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Wed May 21 18:19:02 2014 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Wed May 21 18:19:02 2014 +0300 ---------------------------------------------------------------------- .../1.3.2/services/HIVE/configuration/hive-site.xml | 7 +++++++ .../HDP/1.3.2/services/HIVE/package/scripts/params.py | 1 + .../services/HIVE/package/templates/hive-env.sh.j2 | 2 +- .../2.0.6/services/HIVE/configuration/hive-site.xml | 6 ++++++ .../HDP/2.0.6/services/HIVE/package/scripts/params.py | 1 + .../services/HIVE/package/templates/hive-env.sh.j2 | 2 +- .../HDP/2.1/services/HIVE/configuration/hive-site.xml | 6 ++++++ ambari-web/app/data/HDP2/site_properties.js | 13 +++++++++++++ ambari-web/app/data/service_configs.js | 1 + ambari-web/app/data/site_properties.js | 13 +++++++++++++ 10 files changed, 50 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hive-site.xml index 4a42ea4..3ba7aad 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hive-site.xml @@ -18,6 +18,13 @@ limitations under the License. --> <configuration> + + <property> + <name>hive.heapsize</name> + <value>1024</value> + <description>Hive Java heap size</description> + </property> + <property> <name>ambari.hive.db.schema.name</name> <value>hive</value> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py index 1f21780..39eef3b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py @@ -99,6 +99,7 @@ start_metastore_path = "/tmp/start_metastore_script" hive_aux_jars_path = config['configurations']['global']['hive_aux_jars_path'] hadoop_heapsize = config['configurations']['global']['hadoop_heapsize'] +hive_heapsize = config['configurations']['hive-site']['hive.heapsize'] java64_home = config['hostLevelParams']['java_home'] ##### MYSQL http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 index b2da231..fd040bf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/templates/hive-env.sh.j2 @@ -55,7 +55,7 @@ # The heap size of the jvm stared by hive shell script can be controlled via: -export HADOOP_HEAPSIZE="{{hadoop_heapsize}}" +export HADOOP_HEAPSIZE="{{hive_heapsize}}" export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS" # Larger heap size may be required when running queries over large number of files or partitions. http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml index 7e026bd..eb6ec0e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml @@ -20,6 +20,12 @@ limitations under the License. <configuration> <property> + <name>hive.heapsize</name> + <value>1024</value> + <description>Hive Java heap size</description> + </property> + + <property> <name>ambari.hive.db.schema.name</name> <value>hive</value> <description>Database name used as the Hive Metastore</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py index 96b0e45..a65473d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py @@ -102,6 +102,7 @@ start_metastore_path = "/tmp/start_metastore_script" hive_aux_jars_path = config['configurations']['global']['hive_aux_jars_path'] hadoop_heapsize = config['configurations']['global']['hadoop_heapsize'] +hive_heapsize = config['configurations']['hive-site']['hive.heapsize'] java64_home = config['hostLevelParams']['java_home'] ##### MYSQL http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 index 4e93443..e367c78 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/templates/hive-env.sh.j2 @@ -54,7 +54,7 @@ # The heap size of the jvm stared by hive shell script can be controlled via: -export HADOOP_HEAPSIZE="{{hadoop_heapsize}}" +export HADOOP_HEAPSIZE="{{hive_heapsize}}" export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS" # Larger heap size may be required when running queries over large number of files or partitions. http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml index 37d6554..5a8fb5a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml @@ -20,6 +20,12 @@ limitations under the License. <configuration> <property> + <name>hive.heapsize</name> + <value>1024</value> + <description>Hive Java heap size</description> + </property> + + <property> <name>ambari.hive.db.schema.name</name> <value>hive</value> <description>Database name used as the Hive Metastore</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index bbdbfcd..2a8a982 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -431,6 +431,19 @@ module.exports = }, { "id": "site property", + "name": "hive.heapsize", + "displayName": "Hive heap size", + "description": "Maximum Java heap size for HIVE service (Java option -Xmx)", + "defaultValue": "1024", + "displayType": "int", + "unit": "MB", + "isOverridable": false, + "serviceName": "HIVE", + "category": "General", + "index": 9 + }, + { + "id": "site property", "name": "javax.jdo.option.ConnectionUserName", "displayName": "Database Username", "displayType": "host", http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-web/app/data/service_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js index eee95ce..7be852e 100644 --- a/ambari-web/app/data/service_configs.js +++ b/ambari-web/app/data/service_configs.js @@ -122,6 +122,7 @@ module.exports = [ defaultsProviders: [App.HiveDefaultsProvider.create()], configCategories: [ App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName : 'Hive Metastore'}), + App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}), App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}), App.ServiceConfigCategory.create({ name: 'AdvancedHiveSite', displayName : 'Custom hive-site.xml', siteFileName: 'hive-site.xml', canAddProperty: true}), App.ServiceConfigCategory.create({ name: 'AdvancedHiveLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hive-log4j.xml', canAddProperty: false}), http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c9651e/ambari-web/app/data/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/site_properties.js b/ambari-web/app/data/site_properties.js index f487c3e..846377a 100644 --- a/ambari-web/app/data/site_properties.js +++ b/ambari-web/app/data/site_properties.js @@ -429,6 +429,19 @@ module.exports = }, { "id": "site property", + "name": "hive.heapsize", + "displayName": "Hive heap size", + "description": "Maximum Java heap size for HIVE service (Java option -Xmx)", + "defaultValue": "1024", + "displayType": "int", + "unit": "MB", + "isOverridable": false, + "serviceName": "HIVE", + "category": "General", + "index": 9 + }, + { + "id": "site property", "name": "javax.jdo.option.ConnectionUserName", "displayName": "Database Username", "description": "Database user name to use to connect to the database",