You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/04/28 01:27:23 UTC
[1/2] ambari git commit: AMBARI-10753 - [WinTP2] sql exception during
server setup
Repository: ambari
Updated Branches:
refs/heads/trunk 6a054b35a -> 930b3e4ee
AMBARI-10753 - [WinTP2] sql exception during server setup
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5e2f6b85
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5e2f6b85
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5e2f6b85
Branch: refs/heads/trunk
Commit: 5e2f6b85a25e7a87fee7054c71289c6cebd8d4b7
Parents: 6a054b3
Author: Artem Baranchuk <ab...@hortonworks.con>
Authored: Tue Apr 28 02:24:16 2015 +0300
Committer: Artem Baranchuk <ab...@hortonworks.con>
Committed: Tue Apr 28 02:27:03 2015 +0300
----------------------------------------------------------------------
ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e2f6b85/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
index 8cb3132..f972edc 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
@@ -147,6 +147,8 @@ IF OBJECT_ID('request', 'U') IS NOT NULL DROP TABLE request
GO
IF OBJECT_ID('requestschedule', 'U') IS NOT NULL DROP TABLE requestschedule
GO
+IF OBJECT_ID('serviceconfighosts', 'U') IS NOT NULL DROP TABLE serviceconfighosts
+GO
IF OBJECT_ID('hoststate', 'U') IS NOT NULL DROP TABLE hoststate
GO
IF OBJECT_ID('hostcomponentdesiredstate', 'U') IS NOT NULL DROP TABLE hostcomponentdesiredstate
@@ -185,8 +187,6 @@ IF OBJECT_ID('alert_history', 'U') IS NOT NULL DROP TABLE alert_history
GO
IF OBJECT_ID('alert_definition', 'U') IS NOT NULL DROP TABLE alert_definition
GO
-IF OBJECT_ID('serviceconfighosts', 'U') IS NOT NULL DROP TABLE serviceconfighosts
-GO
IF OBJECT_ID('serviceconfigmapping', 'U') IS NOT NULL DROP TABLE serviceconfigmapping
GO
IF OBJECT_ID('serviceconfig', 'U') IS NOT NULL DROP TABLE serviceconfig
[2/2] ambari git commit: AMBARI-10714 - Separate memory configuration
for Hive CLI vs HiveServer2
Posted by ab...@apache.org.
AMBARI-10714 - Separate memory configuration for Hive CLI vs HiveServer2
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/930b3e4e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/930b3e4e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/930b3e4e
Branch: refs/heads/trunk
Commit: 930b3e4ee567006d2611d1dcb4a694726e984899
Parents: 5e2f6b8
Author: Artem Baranchuk <ab...@hortonworks.con>
Authored: Tue Apr 28 02:26:48 2015 +0300
Committer: Artem Baranchuk <ab...@hortonworks.con>
Committed: Tue Apr 28 02:27:04 2015 +0300
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/configuration/hive-env.xml | 6 ++++++
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 7 ++++++-
.../stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml | 5 +++++
3 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/930b3e4e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index 52cfa10..92373ad 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -22,6 +22,12 @@
<configuration>
<property>
+ <name>hive.client.heapsize</name>
+ <value>512</value>
+ <description>Hive Client Java heap size</description>
+ </property>
+
+ <property>
<name>hive_database_type</name>
<value>mysql</value>
<description>Default HIVE DB type.</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/930b3e4e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index dae198e..62d1a8a 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -214,7 +214,12 @@ start_hiveserver2_path = format("{tmp_dir}/start_hiveserver2_script")
start_metastore_path = format("{tmp_dir}/start_metastore_script")
hadoop_heapsize = config['configurations']['hadoop-env']['hadoop_heapsize']
-hive_heapsize = config['configurations']['hive-site']['hive.heapsize']
+
+if 'role' in config and config['role'] in ["HIVE_SERVER", "HIVE_METASTORE"]:
+ hive_heapsize = config['configurations']['hive-site']['hive.heapsize']
+else:
+ hive_heapsize = config['configurations']['hive-env']['hive.client.heapsize']
+
java64_home = config['hostLevelParams']['java_home']
##### MYSQL
http://git-wip-us.apache.org/repos/asf/ambari/blob/930b3e4e/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
index 1e0feb2..ce60563 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
@@ -21,6 +21,11 @@
-->
<configuration>
+ <property>
+ <name>hive.client.heapsize</name>
+ <deleted>true</deleted>
+ </property>
+
<!-- hive-env.sh -->
<property>
<name>content</name>