You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/09/22 17:12:02 UTC
[3/3] ambari git commit: AMBARI-13188. Ambari QE Deploy Test -
Configuration parameter 'javax.jdo.option.ConnectionPassword' was not found
in configurations dictionary (aonishuk)
AMBARI-13188. Ambari QE Deploy Test - Configuration parameter 'javax.jdo.option.ConnectionPassword' was not found in configurations dictionary (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b70196a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b70196a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b70196a0
Branch: refs/heads/branch-2.1.2
Commit: b70196a0f01cf9e167aa3af695e02afed216ffd4
Parents: 9eb6553
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Sep 22 18:11:52 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Sep 22 18:11:52 2015 +0300
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b70196a0/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 73774eb..51ba9af 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
@@ -28,6 +28,7 @@ from ambari_commons.os_check import OSCheck
from resource_management.libraries.resources.hdfs_resource import HdfsResource
from resource_management.libraries.functions.default import default
from resource_management.libraries.functions.format import format
+from resource_management.libraries.functions.is_empty import is_empty
from resource_management.libraries.functions.version import format_hdp_stack_version
from resource_management.libraries.functions.copy_tarball import STACK_VERSION_PATTERN
from resource_management.libraries.functions import get_kinit_path
@@ -164,7 +165,8 @@ execute_path = os.environ['PATH'] + os.pathsep + hive_bin + os.pathsep + hadoop_
hive_metastore_user_name = config['configurations']['hive-site']['javax.jdo.option.ConnectionUserName']
hive_jdbc_connection_url = config['configurations']['hive-site']['javax.jdo.option.ConnectionURL']
-hive_metastore_user_passwd = unicode(config['configurations']['hive-site']['javax.jdo.option.ConnectionPassword'])
+hive_metastore_user_passwd = config['configurations']['hive-site']['javax.jdo.option.ConnectionPassword']
+hive_metastore_user_passwd = unicode(hive_metastore_user_passwd) if not is_empty(hive_metastore_user_passwd) else hive_metastore_user_passwd
hive_metastore_db_type = config['configurations']['hive-env']['hive_database_type']
#HACK Temporarily use dbType=azuredb while invoking schematool
if hive_metastore_db_type == "mssql":