You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/09/01 11:01:37 UTC
ambari git commit: AMBARI-12947. Change dependency for
datanucleus.rdbms.datastoreAdapterClassName from jdbc class name to jdbc
name.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 818deedec -> 9a7d9b94a
AMBARI-12947. Change dependency for datanucleus.rdbms.datastoreAdapterClassName from jdbc class name to jdbc name.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a7d9b94
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a7d9b94
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a7d9b94
Branch: refs/heads/branch-2.1
Commit: 9a7d9b94a6e4c1ede59d1d00df3e2660f722af8e
Parents: 818deed
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Tue Sep 1 12:01:53 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Tue Sep 1 12:01:53 2015 +0300
----------------------------------------------------------------------
.../HDP/2.3/services/HIVE/configuration/hive-site.xml | 4 ++--
.../main/resources/stacks/HDP/2.3/services/stack_advisor.py | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a7d9b94/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
index e65c9ef..f6b3ce9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
@@ -35,8 +35,8 @@ limitations under the License.
<description>Datanucleus Class, This property used only when hive db is SQLA</description>
<depends-on>
<property>
- <type>hive-site</type>
- <name>javax.jdo.option.ConnectionDriverName</name>
+ <type>hive-env</type>
+ <name>hive_database</name>
</property>
</depends-on>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a7d9b94/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 2d07726..c65e110 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -180,8 +180,8 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
putHiveSiteProperty('hive.tez.java.opts', "-server -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA " + jvmGCParams + " -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps")
# if hive using sqla db, then we should add DataNucleus property
- sqla_db_used = 'hive-site' in services['configurations'] and 'javax.jdo.option.ConnectionDriverName' in services['configurations']['hive-site']['properties'] and \
- services['configurations']['hive-site']['properties']['javax.jdo.option.ConnectionDriverName'] == 'sap.jdbc4.sqlanywhere.IDriver'
+ sqla_db_used = 'hive-env' in services['configurations'] and 'hive_database' in services['configurations']['hive-env']['properties'] and \
+ services['configurations']['hive-env']['properties']['hive_database'] == 'Existing SQLA Database'
if sqla_db_used:
putHiveSiteProperty('datanucleus.rdbms.datastoreAdapterClassName','org.datanucleus.store.rdbms.adapter.SQLAnywhereAdapter')
else:
@@ -239,9 +239,10 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
def validateHiveConfigurations(self, properties, recommendedDefaults, configurations, services, hosts):
super(HDP23StackAdvisor, self).validateHiveConfigurations(properties, recommendedDefaults, configurations, services, hosts)
hive_site = properties
+ hive_env_properties = getSiteProperties(configurations, "hive-env")
validationItems = []
- sqla_db_used = "javax.jdo.option.ConnectionDriverName" in hive_site and \
- hive_site['javax.jdo.option.ConnectionDriverName'] == 'sap.jdbc4.sqlanywhere.IDriver'
+ sqla_db_used = "hive_database" in hive_env_properties and \
+ hive_env_properties['hive_database'] == 'Existing SQLA Database'
prop_name = "datanucleus.rdbms.datastoreAdapterClassName"
prop_value = "org.datanucleus.store.rdbms.adapter.SQLAnywhereAdapter"
if sqla_db_used: