You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/06/17 03:33:11 UTC
ambari git commit: AMBARI-17284 - Hive Metastore Upgrade Fails
Because Of Missing Hive Interactive Directory (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 75d44052a -> fac89e740
AMBARI-17284 - Hive Metastore Upgrade Fails Because Of Missing Hive Interactive Directory (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fac89e74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fac89e74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fac89e74
Branch: refs/heads/trunk
Commit: fac89e7400e2dc0a0673ffd4a86b413f99857b18
Parents: 75d4405
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu Jun 16 16:59:05 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Thu Jun 16 23:15:39 2016 -0400
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 8 +-
.../package/scripts/hive_metastore.py | 2 +-
.../0.12.0.2.0/package/scripts/hive_service.py | 8 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 169 +++++++++----------
.../stacks/2.0.6/HIVE/test_hive_metastore.py | 28 +--
.../stacks/2.0.6/HIVE/test_hive_server.py | 56 +++---
.../2.0.6/HIVE/test_hive_service_check.py | 16 +-
.../stacks/2.0.6/HIVE/test_webhcat_server.py | 16 +-
.../stacks/2.1/HIVE/test_hive_metastore.py | 45 ++---
.../src/test/python/stacks/utils/RMFTestCase.py | 2 +
10 files changed, 174 insertions(+), 176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index ef0fd6b..30cc942 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -268,10 +268,10 @@ def hive(name=None):
)
if name == 'metastore' or name == 'hiveserver2':
- if params.target_hive is not None and not os.path.exists(params.target_hive):
- jdbc_connector(params.target_hive, params.hive_previous_jdbc_jar)
- if params.target_hive2 is not None and not os.path.exists(params.target_hive2):
- jdbc_connector(params.target_hive2, params.hive2_previous_jdbc_jar)
+ if params.hive_jdbc_target is not None and not os.path.exists(params.hive_jdbc_target):
+ jdbc_connector(params.hive_jdbc_target, params.hive_previous_jdbc_jar)
+ if params.hive2_jdbc_target is not None and not os.path.exists(params.hive2_jdbc_target):
+ jdbc_connector(params.hive2_jdbc_target, params.hive2_previous_jdbc_jar)
File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
index 55cddd6..772eff8 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_metastore.py
@@ -199,7 +199,7 @@ class HiveMetastoreDefault(HiveMetastore):
# download it if it does not exist
if not os.path.exists(params.source_jdbc_file):
- jdbc_connector(params.target_hive, params.hive_previous_jdbc_jar)
+ jdbc_connector(params.hive_jdbc_target, params.hive_previous_jdbc_jar)
target_directory_and_filename = os.path.join(target_directory, os.path.basename(params.source_jdbc_file))
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
index 0a3d921..afc9a4d 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
@@ -100,12 +100,12 @@ def hive_service(name, action='start', upgrade_type=None):
validation_called = False
- if params.target_hive is not None:
+ if params.hive_jdbc_target is not None:
validation_called = True
- validate_connection(params.target_hive, params.hive_lib)
- if params.target_hive2 is not None:
+ validate_connection(params.hive_jdbc_target, params.hive_lib)
+ if params.hive2_jdbc_target is not None:
validation_called = True
- validate_connection(params.target_hive2, params.hive_lib2)
+ validate_connection(params.hive2_jdbc_target, params.hive_server2_hive2_lib)
if not validation_called:
emessage = "ERROR! DB connection check should be executed at least one time!"
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/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 81207d6..9dbc18d 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
@@ -80,21 +80,47 @@ downgrade_from_version = default("/commandParams/downgrade_from_version", None)
# Upgrade direction
upgrade_direction = default("/commandParams/upgrade_direction", None)
-stack_supports_ranger_kerberos = stack_version_formatted_major and check_stack_feature(StackFeature.RANGER_KERBEROS_SUPPORT, stack_version_formatted_major)
-
-hadoop_bin_dir = "/usr/bin"
-hadoop_home = '/usr'
-hive_user_home_dir = "/home/hive"
-hive_bin = '/usr/lib/hive/bin'
-hive_schematool_bin = '/usr/lib/hive/bin'
-hive_schematool_ver_bin = hive_schematool_bin
-hive_lib = '/usr/lib/hive/lib/'
-hive_lib2 = None
+stack_supports_ranger_kerberos = check_stack_feature(StackFeature.RANGER_KERBEROS_SUPPORT, stack_version_formatted_major)
+
+# component ROLE directory (like hive-metastore or hive-server2-hive2)
+component_directory = status_params.component_directory
+component_directory_interactive = status_params.component_directory_interactive
+
+hadoop_home = format('{stack_root}/current/hadoop-client')
+hive_bin = format('{stack_root}/current/{component_directory}/bin')
+hive_schematool_ver_bin = format('{stack_root}/{version}/hive/bin')
+hive_schematool_bin = format('{stack_root}/current/{component_directory}/bin')
+hive_lib = format('{stack_root}/current/{component_directory}/lib')
+hive_version_lib = format('{stack_root}/{version}/hive/lib')
hive_var_lib = '/var/lib/hive'
+hive_user_home_dir = "/home/hive"
+
+# starting on stacks where HSI is supported, we need to begin using the 'hive2' schematool
+hive_server2_hive2_dir = None
+hive_server2_hive2_lib = None
+if check_stack_feature(StackFeature.HIVE_SERVER_INTERACTIVE, stack_version_unformatted):
+ hive_schematool_ver_bin = format('{stack_root}/{version}/hive2/bin')
+ hive_schematool_bin = format('{stack_root}/current/{component_directory}/bin')
+ hive_server2_hive2_component = status_params.SERVER_ROLE_DIRECTORY_MAP["HIVE_SERVER_INTERACTIVE"]
+
+ # <stack-root>/<version>/hive2 (as opposed to <stack-root>/<version>/hive)
+ hive_server2_hive2_dir = format('{stack_root}/current/{hive_server2_hive2_component}')
+
+ # <stack-root>/<version>/hive2 (as opposed to <stack-root>/<version>/hive)
+ hive_server2_hive2_version_dir = format('{stack_root}/{version}/hive2')
+
+ # <stack-root>/current/hive-server2-hive2/lib -> <stack-root>/<version>/hive2/lib
+ hive_server2_hive2_lib = format('{hive_server2_hive2_dir}/lib')
+
+ # <stack-root>/<version>/hive2/lib
+ hive_server2_hive2_version_lib = format('{hive_server2_hive2_version_dir}/lib')
+
+
+hive_specific_configs_supported = True
+hive_interactive_bin = format('{stack_root}/current/{component_directory_interactive}/bin')
+hive_interactive_lib = format('{stack_root}/current/{component_directory_interactive}/lib')
# Hive Interactive related paths
-hive_interactive_bin = '/usr/lib/hive2/bin'
-hive_interactive_lib = '/usr/lib/hive2/lib/'
hive_interactive_var_lib = '/var/lib/hive2'
# These tar folders were used in previous stack versions, e.g., HDP 2.1
@@ -127,78 +153,40 @@ config_dir = '/etc/hive-webhcat/conf'
hcat_lib = '/usr/lib/hive-hcatalog/share/hcatalog'
webhcat_bin_dir = '/usr/lib/hive-hcatalog/sbin'
+# there are no client versions of these, use server versions directly
+hcat_lib = format('{stack_root}/current/hive-webhcat/share/hcatalog')
+webhcat_bin_dir = format('{stack_root}/current/hive-webhcat/sbin')
+
+# --- Tarballs ---
+# DON'T CHANGE THESE VARIABLE NAMES
+# Values don't change from those in copy_tarball.py
+webhcat_apps_dir = "/apps/webhcat"
+hive_tar_source = "{0}/{1}/hive/hive.tar.gz".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN)
+pig_tar_source = "{0}/{1}/pig/pig.tar.gz".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN)
+hive_tar_dest_file = "/{0}/apps/{1}/hive/hive.tar.gz".format(STACK_NAME_PATTERN,STACK_VERSION_PATTERN)
+pig_tar_dest_file = "/{0}/apps/{1}/pig/pig.tar.gz".format(STACK_NAME_PATTERN, STACK_VERSION_PATTERN)
+
+hadoop_streaming_tar_source = "{0}/{1}/hadoop-mapreduce/hadoop-streaming.jar".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN)
+sqoop_tar_source = "{0}/{1}/sqoop/sqoop.tar.gz".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN)
+hadoop_streaming_tar_dest_dir = "/{0}/apps/{1}/mapreduce/".format(STACK_NAME_PATTERN,STACK_VERSION_PATTERN)
+sqoop_tar_dest_dir = "/{0}/apps/{1}/sqoop/".format(STACK_NAME_PATTERN, STACK_VERSION_PATTERN)
+
+tarballs_mode = 0444
+
purge_tables = "false"
# Starting from stack version for feature hive_purge_table drop should be executed with purge
-if stack_version_formatted_major and check_stack_feature(StackFeature.HIVE_PURGE_TABLE, stack_version_formatted_major):
+if check_stack_feature(StackFeature.HIVE_PURGE_TABLE, stack_version_formatted_major):
purge_tables = 'true'
-if stack_version_formatted_major and check_stack_feature(StackFeature.HIVE_WEBHCAT_SPECIFIC_CONFIGS, stack_version_formatted_major):
+if check_stack_feature(StackFeature.HIVE_WEBHCAT_SPECIFIC_CONFIGS, stack_version_formatted_major):
# this is NOT a typo. Configs for hcatalog/webhcat point to a
# specific directory which is NOT called 'conf'
hcat_conf_dir = format('{stack_root}/current/hive-webhcat/etc/hcatalog')
config_dir = format('{stack_root}/current/hive-webhcat/etc/webhcat')
-if stack_version_formatted_major and check_stack_feature(StackFeature.HIVE_METASTORE_SITE_SUPPORT, stack_version_formatted_major):
+if check_stack_feature(StackFeature.HIVE_METASTORE_SITE_SUPPORT, stack_version_formatted_major):
hive_metastore_site_supported = True
-if stack_version_formatted_major and check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted_major):
- hive_specific_configs_supported = True
-
- component_directory = status_params.component_directory
- component_directory_interactive = status_params.component_directory_interactive
- hadoop_home = format('{stack_root}/current/hadoop-client')
- hive_bin = format('{stack_root}/current/{component_directory}/bin')
- hive_interactive_bin = format('{stack_root}/current/{component_directory_interactive}/bin')
- hive_lib = format('{stack_root}/current/{component_directory}/lib')
- hive_interactive_lib = format('{stack_root}/current/{component_directory_interactive}/lib')
-
- if stack_version_unformatted is not None and check_stack_feature(StackFeature.HIVE_SERVER_INTERACTIVE, stack_version_unformatted):
- schema_hive_component_ver = "hive2"
- schema_hive_component = status_params.SERVER_ROLE_DIRECTORY_MAP["HIVE_SERVER_INTERACTIVE"]
- hive_lib2 = format('{stack_root}/current/{schema_hive_component}/lib')
- else:
- schema_hive_component_ver = "hive"
- schema_hive_component = status_params.SERVER_ROLE_DIRECTORY_MAP["HIVE_SERVER"]
-
- hive_schematool_ver_bin = format('{stack_root}/{version}/{schema_hive_component_ver}/bin')
- hive_schematool_bin = format('{stack_root}/current/{schema_hive_component}/bin')
-
- # there are no client versions of these, use server versions directly
- hcat_lib = format('{stack_root}/current/hive-webhcat/share/hcatalog')
- webhcat_bin_dir = format('{stack_root}/current/hive-webhcat/sbin')
-
- # --- Tarballs ---
- # DON'T CHANGE THESE VARIABLE NAMES
- # Values don't change from those in copy_tarball.py
- hive_tar_source = "{0}/{1}/hive/hive.tar.gz".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN)
- pig_tar_source = "{0}/{1}/pig/pig.tar.gz".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN)
- hive_tar_dest_file = "/{0}/apps/{1}/hive/hive.tar.gz".format(STACK_NAME_PATTERN, STACK_VERSION_PATTERN)
- pig_tar_dest_file = "/{0}/apps/{1}/pig/pig.tar.gz".format(STACK_NAME_PATTERN, STACK_VERSION_PATTERN)
-
- hadoop_streaming_tar_source = "{0}/{1}/hadoop-mapreduce/hadoop-streaming.jar".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN)
- sqoop_tar_source = "{0}/{1}/sqoop/sqoop.tar.gz".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN)
- hadoop_streaming_tar_dest_dir = "/{0}/apps/{1}/mapreduce/".format(STACK_NAME_PATTERN, STACK_VERSION_PATTERN)
- sqoop_tar_dest_dir = "/{0}/apps/{1}/sqoop/".format(STACK_NAME_PATTERN, STACK_VERSION_PATTERN)
-
- tarballs_mode = 0444
-else:
- # --- Tarballs ---
- webhcat_apps_dir = "/apps/webhcat"
-
- # In previous versions, the tarballs were copied from and to different locations.
- # DON'T CHANGE THESE VARIABLE NAMES
- hive_tar_source = hive_tar_file
- pig_tar_source = pig_tar_file
- hive_tar_dest_file = webhcat_apps_dir + "/hive.tar.gz"
- pig_tar_dest_file = webhcat_apps_dir + "/pig.tar.gz"
-
- hadoop_streaming_tar_source = hadoop_streaming_jars # this contains *
- sqoop_tar_source = sqoop_tar_file # this contains *
- hadoop_streaming_tar_dest_dir = webhcat_apps_dir
- sqoop_tar_dest_dir = webhcat_apps_dir
-
- tarballs_mode = 0755
-
execute_path = os.environ['PATH'] + os.pathsep + hive_bin + os.pathsep + hadoop_bin_dir
hive_metastore_user_name = config['configurations']['hive-site']['javax.jdo.option.ConnectionUserName']
@@ -207,12 +195,14 @@ hive_jdbc_connection_url = config['configurations']['hive-site']['javax.jdo.opti
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":
hive_metastore_db_type = "azuredb"
#users
hive_user = config['configurations']['hive-env']['hive_user']
+
#JDBC driver jar name
hive_jdbc_driver = config['configurations']['hive-site']['javax.jdo.option.ConnectionDriverName']
jdk_location = config['hostLevelParams']['jdk_location']
@@ -230,7 +220,6 @@ default_connectors_map = { "com.microsoft.sqlserver.jdbc.SQLServerDriver":"sqljd
# NOT SURE THAT IT'S A GOOD IDEA TO USE PATH TO CLASS IN DRIVER, MAYBE IT WILL BE BETTER TO USE DB TYPE.
# BECAUSE PATH TO CLASSES COULD BE CHANGED
sqla_db_used = False
-target_hive = None
hive_previous_jdbc_jar_name = None
if hive_jdbc_driver == "com.microsoft.sqlserver.jdbc.SQLServerDriver":
jdbc_jar_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
@@ -257,18 +246,25 @@ if not hive_use_existing_db:
downloaded_custom_connector = format("{tmp_dir}/{jdbc_jar_name}")
-target_hive = format("{hive_lib}/{jdbc_jar_name}")
-target_hive2 = format("{hive_lib2}/{jdbc_jar_name}") if hive_lib2 is not None else None
-hive2_previous_jdbc_jar = format("{hive_lib2}/{hive_previous_jdbc_jar_name}") if hive_lib2 is not None else None
+
+hive_jdbc_target = format("{hive_lib}/{jdbc_jar_name}")
+hive2_jdbc_target = None
+if hive_server2_hive2_dir:
+ hive2_jdbc_target = format("{hive_server2_hive2_lib}/{jdbc_jar_name}")
+
+# during upgrade / downgrade, use the specific version to copy the JDBC JAR to
+if upgrade_direction:
+ hive_jdbc_target = format("{hive_version_lib}/{jdbc_jar_name}")
+ hive2_jdbc_target = format("{hive_server2_hive2_version_lib}/{jdbc_jar_name}") if hive2_jdbc_target is not None else None
+
+
+hive2_previous_jdbc_jar = format("{hive_server2_hive2_lib}/{hive_previous_jdbc_jar_name}") if hive_server2_hive2_lib is not None else None
driver_curl_source = format("{jdk_location}/{jdbc_jar_name}")
-if not (stack_version_formatted_major and check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted_major)):
- source_jdbc_file = target_hive
-else:
- # normally, the JDBC driver would be referenced by <stack-root>/current/.../foo.jar
- # but in RU if <stack-selector-tool> is called and the restart fails, then this means that current pointer
- # is now pointing to the upgraded version location; that's bad for the cp command
- source_jdbc_file = format("{stack_root}/{current_version}/hive/lib/{jdbc_jar_name}")
+# normally, the JDBC driver would be referenced by <stack-root>/current/.../foo.jar
+# but in RU if <stack-selector-tool> is called and the restart fails, then this means that current pointer
+# is now pointing to the upgraded version location; that's bad for the cp command
+source_jdbc_file = format("{stack_root}/{current_version}/hive/lib/{jdbc_jar_name}")
check_db_connection_jar_name = "DBConnectionVerification.jar"
check_db_connection_jar = format("/usr/lib/ambari-agent/{check_db_connection_jar_name}")
@@ -372,7 +368,6 @@ artifact_dir = format("{tmp_dir}/AMBARI-artifacts/")
# Need this for yarn.nodemanager.recovery.dir in yarn-site
yarn_log_dir_prefix = config['configurations']['yarn-env']['yarn_log_dir_prefix']
-target_hive = format("{hive_lib}/{jdbc_jar_name}")
target_hive_interactive = format("{hive_interactive_lib}/{jdbc_jar_name}")
hive_intaractive_previous_jdbc_jar = format("{hive_interactive_lib}/{hive_previous_jdbc_jar_name}")
jars_in_hive_lib = format("{hive_lib}/*.jar")
@@ -385,7 +380,7 @@ yarn_scheduler_allocation_minimum_mb = config['configurations']['yarn-site']['pr
hadoop_heapsize = config['configurations']['hadoop-env']['hadoop_heapsize']
if 'role' in config and config['role'] in ["HIVE_SERVER", "HIVE_METASTORE"]:
- if stack_version_formatted_major and check_stack_feature(StackFeature.HIVE_ENV_HEAPSIZE, stack_version_formatted_major):
+ if check_stack_feature(StackFeature.HIVE_ENV_HEAPSIZE, stack_version_formatted_major):
hive_heapsize = config['configurations']['hive-env']['hive.heapsize']
else:
hive_heapsize = config['configurations']['hive-site']['hive.heapsize']
@@ -608,7 +603,7 @@ if has_hive_interactive:
pass
# ranger host
-stack_supports_ranger_audit_db = stack_version_formatted_major and check_stack_feature(StackFeature.RANGER_AUDIT_DB_SUPPORT, stack_version_formatted_major)
+stack_supports_ranger_audit_db = check_stack_feature(StackFeature.RANGER_AUDIT_DB_SUPPORT, stack_version_formatted_major)
ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", [])
has_ranger_admin = not len(ranger_admin_hosts) == 0
xml_configurations_supported = config['configurations']['ranger-env']['xml_configurations_supported']
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
index 9039ea4..4909c77 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
@@ -48,14 +48,14 @@ class TestHiveMetastore(RMFTestCase):
self.assert_configure_default()
self.assertResourceCalled('Execute', '/tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.err /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
tries = 5,
try_sleep = 10,
@@ -108,14 +108,14 @@ class TestHiveMetastore(RMFTestCase):
)
self.assert_configure_secured()
self.assertResourceCalled('Execute', '/tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.err /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
tries = 5,
try_sleep = 10,
@@ -215,11 +215,11 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('Execute', ('cp',
'--remove-destination',
'/usr/share/java/mysql-connector-java.jar',
- '/usr/lib/hive/lib//mysql-connector-java.jar'),
+ '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar'),
path = ['/bin', '/usr/bin/'],
sudo = True,
)
- self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar',
+ self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar',
mode = 0644,
)
self.assertResourceCalled('File', '/usr/lib/ambari-agent/DBConnectionVerification.jar',
@@ -235,8 +235,8 @@ class TestHiveMetastore(RMFTestCase):
content = StaticFile('startMetastore.sh'),
mode = 0755,
)
- self.assertResourceCalled('Execute', 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -initSchema -dbType mysql -userName hive -passWord \'!`"\'"\'"\' 1\' -verbose',
- not_if = 'ambari-sudo.sh su hive -l -s /bin/bash -c \'[RMF_EXPORT_PLACEHOLDER]export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -info -dbType mysql -userName hive -passWord \'"\'"\'!`"\'"\'"\'"\'"\'"\'"\'"\'"\' 1\'"\'"\' -verbose\'',
+ self.assertResourceCalled('Execute', 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/hdp/current/hive-server2/bin/schematool -initSchema -dbType mysql -userName hive -passWord \'!`"\'"\'"\' 1\' -verbose',
+ not_if = 'ambari-sudo.sh su hive -l -s /bin/bash -c \'[RMF_EXPORT_PLACEHOLDER]export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/hdp/current/hive-server2/bin/schematool -info -dbType mysql -userName hive -passWord \'"\'"\'!`"\'"\'"\'"\'"\'"\'"\'"\'"\' 1\'"\'"\' -verbose\'',
user = 'hive',
)
self.assertResourceCalled('Directory', '/var/run/hive',
@@ -328,11 +328,11 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('Execute', ('cp',
'--remove-destination',
'/usr/share/java/mysql-connector-java.jar',
- '/usr/lib/hive/lib//mysql-connector-java.jar'),
+ '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar'),
path = ['/bin', '/usr/bin/'],
sudo = True,
)
- self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar',
+ self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar',
mode = 0644,
)
self.assertResourceCalled('File', '/usr/lib/ambari-agent/DBConnectionVerification.jar',
@@ -348,8 +348,8 @@ class TestHiveMetastore(RMFTestCase):
content = StaticFile('startMetastore.sh'),
mode = 0755,
)
- self.assertResourceCalled('Execute', 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -initSchema -dbType mysql -userName hive -passWord \'!`"\'"\'"\' 1\' -verbose',
- not_if = 'ambari-sudo.sh su hive -l -s /bin/bash -c \'[RMF_EXPORT_PLACEHOLDER]export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -info -dbType mysql -userName hive -passWord \'"\'"\'!`"\'"\'"\'"\'"\'"\'"\'"\'"\' 1\'"\'"\' -verbose\'',
+ self.assertResourceCalled('Execute', 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/hdp/current/hive-server2/bin/schematool -initSchema -dbType mysql -userName hive -passWord \'!`"\'"\'"\' 1\' -verbose',
+ not_if = 'ambari-sudo.sh su hive -l -s /bin/bash -c \'[RMF_EXPORT_PLACEHOLDER]export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/hdp/current/hive-server2/bin/schematool -info -dbType mysql -userName hive -passWord \'"\'"\'!`"\'"\'"\'"\'"\'"\'"\'"\'"\' 1\'"\'"\' -verbose\'',
user = 'hive',
)
self.assertResourceCalled('Directory', '/var/run/hive',
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index 3c224a8..ba10939 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -73,19 +73,19 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('Execute',
'hive --config /etc/hive/conf.server --service metatool -updateLocation hdfs://c6401.ambari.apache.org:8020 OK.',
- environment={'PATH': '/bin:/usr/lib/hive/bin:/usr/bin'},
+ environment={'PATH': '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'},
user='hive'
)
self.assertResourceCalled('Execute', '/tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.err /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
self.assertResourceCalled('Execute',
- '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
+ '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
tries=5,
try_sleep=10
@@ -108,15 +108,15 @@ class TestHiveServer(RMFTestCase):
self.assert_configure_default(default_fs_default='hcfs://c6401.ambari.apache.org:8020')
self.assertResourceCalled('Execute', '/tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.err /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
self.assertResourceCalled('Execute',
- '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
+ '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
tries=5,
try_sleep=10
@@ -135,19 +135,19 @@ class TestHiveServer(RMFTestCase):
self.assert_configure_default()
self.assertResourceCalled('Execute', 'hive --config /etc/hive/conf.server --service metatool -updateLocation hdfs://c6401.ambari.apache.org:8020 OK.',
- environment = {'PATH': '/bin:/usr/lib/hive/bin:/usr/bin'},
+ environment = {'PATH': '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'},
user = 'hive',
)
self.assertResourceCalled('Execute', '/tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.err /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries=5, try_sleep=10
)
self.assertNoMoreResources()
@@ -166,19 +166,19 @@ class TestHiveServer(RMFTestCase):
self.assert_configure_default(no_tmp=True)
self.assertResourceCalled('Execute', 'hive --config /etc/hive/conf.server --service metatool -updateLocation hdfs://c6401.ambari.apache.org:8020 OK.',
- environment = {'PATH': '/bin:/usr/lib/hive/bin:/usr/bin'},
+ environment = {'PATH': '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'},
user = 'hive',
)
self.assertResourceCalled('Execute', '/tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.err /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries=5, try_sleep=10
)
self.assertNoMoreResources()
@@ -197,19 +197,19 @@ class TestHiveServer(RMFTestCase):
self.assert_configure_default(no_tmp=True)
self.assertResourceCalled('Execute', 'hive --config /etc/hive/conf.server --service metatool -updateLocation hdfs://c6401.ambari.apache.org:8020 OK.',
- environment = {'PATH': '/bin:/usr/lib/hive/bin:/usr/bin'},
+ environment = {'PATH': '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'},
user = 'hive',
)
self.assertResourceCalled('Execute', '/tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.err /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries=5, try_sleep=10
)
self.assertNoMoreResources()
@@ -272,15 +272,15 @@ class TestHiveServer(RMFTestCase):
user = 'hive',
)
self.assertResourceCalled('Execute', '/tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.err /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
self.assertResourceCalled('Execute',
- '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
+ '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
tries=5,
try_sleep=10,
@@ -478,11 +478,11 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('Execute', ('cp',
'--remove-destination',
'/usr/share/java/mysql-connector-java.jar',
- '/usr/lib/hive/lib//mysql-connector-java.jar'),
+ '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar'),
path=['/bin', '/usr/bin/'],
sudo=True,
)
- self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar',
+ self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar',
mode=0644,
)
self.assertResourceCalled('File', '/usr/lib/ambari-agent/DBConnectionVerification.jar',
@@ -671,11 +671,11 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('Execute', ('cp',
'--remove-destination',
'/usr/share/java/mysql-connector-java.jar',
- '/usr/lib/hive/lib//mysql-connector-java.jar'),
+ '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar'),
path=['/bin', '/usr/bin/'],
sudo=True,
)
- self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar',
+ self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar',
mode=0644,
)
self.assertResourceCalled('File', '/usr/lib/ambari-agent/DBConnectionVerification.jar',
@@ -757,7 +757,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,)
- self.assertResourceCalledByIndex(32, 'Execute', 'hive --config /etc/hive/conf.server --service hiveserver2 --deregister 1.2.1.2.3.0.0-2434',
+ self.assertResourceCalledIgnoreEarlier('Execute', 'hive --config /etc/hive/conf.server --service hiveserver2 --deregister 1.2.1.2.3.0.0-2434',
path=['/bin:/usr/hdp/current/hive-server2/bin:/usr/hdp/current/hadoop-client/bin'],
tries=1, user='hive')
@@ -780,7 +780,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,)
- self.assertResourceCalledByIndex(34, 'Execute', 'hive --config /etc/hive/conf.server --service hiveserver2 --deregister 1.2.1.2.3.0.0-2434',
+ self.assertResourceCalledIgnoreEarlier( 'Execute', 'hive --config /etc/hive/conf.server --service hiveserver2 --deregister 1.2.1.2.3.0.0-2434',
path=['/bin:/usr/hdp/current/hive-server2/bin:/usr/hdp/current/hadoop-client/bin'],
tries=1, user='hive')
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
index 3405a65..a8b5421 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
@@ -57,7 +57,7 @@ class TestServiceCheck(RMFTestCase):
'/usr/local/bin',
'/bin',
'/usr/bin',
- '/bin:/usr/lib/hive/bin:/usr/bin'],
+ '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
tries = 3,
user = 'ambari-qa',
try_sleep = 5,
@@ -66,7 +66,7 @@ class TestServiceCheck(RMFTestCase):
conf_dir = '/etc/hadoop/conf',
logoutput = True,
user = 'hdfs',
- bin_dir = '/bin:/usr/lib/hive/bin:/usr/bin',
+ bin_dir = '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin',
)
self.assertResourceCalled('Execute', ' /tmp/hcatSmoke.sh hcatsmoke cleanup false',
logoutput = True,
@@ -74,7 +74,7 @@ class TestServiceCheck(RMFTestCase):
'/usr/local/bin',
'/bin',
'/usr/bin',
- '/bin:/usr/lib/hive/bin:/usr/bin'],
+ '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
tries = 3,
user = 'ambari-qa',
try_sleep = 5,
@@ -168,7 +168,7 @@ class TestServiceCheck(RMFTestCase):
self.maxDiff = None
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa@EXAMPLE.COM; env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/hcatSmoke.sh hcatsmoke prepare false',
logoutput = True,
- path = ['/usr/sbin','/usr/local/bin','/bin','/usr/bin', '/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/usr/sbin','/usr/local/bin','/bin','/usr/bin', '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
tries = 3,
user = 'ambari-qa',
try_sleep = 5,
@@ -180,7 +180,7 @@ class TestServiceCheck(RMFTestCase):
conf_dir = '/etc/hadoop/conf',
logoutput = True,
user = 'hdfs',
- bin_dir = '/bin:/usr/lib/hive/bin:/usr/bin',
+ bin_dir = '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin',
)
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa@EXAMPLE.COM; /tmp/hcatSmoke.sh hcatsmoke cleanup false',
logoutput = True,
@@ -188,7 +188,7 @@ class TestServiceCheck(RMFTestCase):
'/usr/local/bin',
'/bin',
'/usr/bin',
- '/bin:/usr/lib/hive/bin:/usr/bin'],
+ '/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
tries = 3,
user = 'ambari-qa',
try_sleep = 5,
@@ -197,7 +197,7 @@ class TestServiceCheck(RMFTestCase):
content = StaticFile('templetonSmoke.sh'),
mode = 0755,
)
-
+
self.assertResourceCalled('File', '/tmp/idtest.ambari-qa.1431110511.43.pig',
content = Template('templeton_smoke.pig.j2', templeton_test_input='/tmp/idtest.ambari-qa.1431110511.43.in', templeton_test_output='/tmp/idtest.ambari-qa.1431110511.43.out'),
owner = "hdfs"
@@ -259,7 +259,7 @@ class TestServiceCheck(RMFTestCase):
self.assertNoMoreResources()
-
+
def test_service_check_during_upgrade(self, socket_mock):
config_file = self.get_src_folder() + "/test/python/stacks/2.2/configs/hive-upgrade.json"
with open(config_file, 'r') as f:
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
index d5ab0b6..f71bba9 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
@@ -49,8 +49,8 @@ class TestWebHCatServer(RMFTestCase):
)
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'cd /var/run/webhcat ; /usr/lib/hive-hcatalog/sbin/webhcat_server.sh start',
- environment = {'HADOOP_HOME': '/usr'},
+ self.assertResourceCalled('Execute', 'cd /var/run/webhcat ; /usr/hdp/current/hive-webhcat/sbin/webhcat_server.sh start',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client'},
not_if = "ambari-sudo.sh su hcat -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps -p `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1'",
user = 'hcat',
)
@@ -65,9 +65,9 @@ class TestWebHCatServer(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES
)
- self.assertResourceCalled('Execute', '/usr/lib/hive-hcatalog/sbin/webhcat_server.sh stop',
+ self.assertResourceCalled('Execute', '/usr/hdp/current/hive-webhcat/sbin/webhcat_server.sh stop',
user = 'hcat',
- environment = {'HADOOP_HOME': '/usr' }
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client' }
)
self.assertResourceCalled('Execute', 'ambari-sudo.sh kill -9 `ambari-sudo.sh su hcat -l -s /bin/bash -c \'[RMF_EXPORT_PLACEHOLDER]cat /var/run/webhcat/webhcat.pid\'`',
@@ -138,8 +138,8 @@ class TestWebHCatServer(RMFTestCase):
)
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'cd /var/run/webhcat ; /usr/lib/hive-hcatalog/sbin/webhcat_server.sh start',
- environment = {'HADOOP_HOME': '/usr'},
+ self.assertResourceCalled('Execute', 'cd /var/run/webhcat ; /usr/hdp/current/hive-webhcat/sbin/webhcat_server.sh start',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client'},
not_if = "ambari-sudo.sh su hcat -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps -p `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1'",
user = 'hcat',
)
@@ -154,9 +154,9 @@ class TestWebHCatServer(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES
)
- self.assertResourceCalled('Execute', '/usr/lib/hive-hcatalog/sbin/webhcat_server.sh stop',
+ self.assertResourceCalled('Execute', '/usr/hdp/current/hive-webhcat/sbin/webhcat_server.sh stop',
user = 'hcat',
- environment = {'HADOOP_HOME': '/usr' }
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client' }
)
self.assertResourceCalled('Execute', 'ambari-sudo.sh kill -9 `ambari-sudo.sh su hcat -l -s /bin/bash -c \'[RMF_EXPORT_PLACEHOLDER]cat /var/run/webhcat/webhcat.pid\'`',
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
index c36b428..044598d 100644
--- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
@@ -29,6 +29,7 @@ from resource_management.libraries.script.script import Script
@patch("platform.linux_distribution", new = MagicMock(return_value="Linux"))
@patch("resource_management.libraries.functions.get_user_call_output.get_user_call_output", new=MagicMock(return_value=(0,'123','')))
class TestHiveMetastore(RMFTestCase):
+
COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package"
STACK_VERSION = "2.0.6"
@@ -54,15 +55,15 @@ class TestHiveMetastore(RMFTestCase):
self.assert_configure_default()
self.assertResourceCalled('Execute', '/tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.err /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive aaa com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive aaa com.mysql.jdbc.Driver',
path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
tries = 5,
try_sleep = 10,
@@ -84,14 +85,14 @@ class TestHiveMetastore(RMFTestCase):
self.assert_configure_default()
self.assertResourceCalled('Execute', '/tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.err /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive aaa com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive aaa com.mysql.jdbc.Driver',
path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
tries = 5,
try_sleep = 10,
@@ -146,15 +147,15 @@ class TestHiveMetastore(RMFTestCase):
self.assert_configure_secured()
self.assertResourceCalled('Execute', '/tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.err /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive',
- environment = {'HADOOP_HOME': '/usr',
+ environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client',
'HIVE_BIN': 'hive',
'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = "ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p 123 >/dev/null 2>&1",
user = 'hive',
- path = ['/bin:/usr/lib/hive/bin:/usr/bin'],
+ path = ['/bin:/usr/hdp/current/hive-server2/bin:/usr/bin'],
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/lib/hive/lib//mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive asd com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive asd com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries=5, try_sleep=10
)
@@ -240,11 +241,11 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('Execute', ('cp',
'--remove-destination',
'/usr/share/java/mysql-connector-java.jar',
- '/usr/lib/hive/lib//mysql-connector-java.jar'),
+ '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar'),
path = ['/bin', '/usr/bin/'],
sudo = True,
)
- self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar',
+ self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar',
mode = 0644,
)
self.assertResourceCalled('File', '/usr/lib/ambari-agent/DBConnectionVerification.jar',
@@ -260,8 +261,8 @@ class TestHiveMetastore(RMFTestCase):
content = StaticFile('startMetastore.sh'),
mode = 0755,
)
- self.assertResourceCalled('Execute', 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -initSchema -dbType mysql -userName hive -passWord aaa -verbose',
- not_if = "ambari-sudo.sh su hive -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -info -dbType mysql -userName hive -passWord aaa -verbose'",
+ self.assertResourceCalled('Execute', 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/hdp/current/hive-server2/bin/schematool -initSchema -dbType mysql -userName hive -passWord aaa -verbose',
+ not_if = "ambari-sudo.sh su hive -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/hdp/current/hive-server2/bin/schematool -info -dbType mysql -userName hive -passWord aaa -verbose'",
user = 'hive',
)
self.assertResourceCalled('Directory', '/var/run/hive',
@@ -341,11 +342,11 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('Execute', ('cp',
'--remove-destination',
'/usr/share/java/mysql-connector-java.jar',
- '/usr/lib/hive/lib//mysql-connector-java.jar'),
+ '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar'),
path = ['/bin', '/usr/bin/'],
sudo = True,
)
- self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar',
+ self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar',
mode = 0644,
)
self.assertResourceCalled('File', '/usr/lib/ambari-agent/DBConnectionVerification.jar',
@@ -363,8 +364,8 @@ class TestHiveMetastore(RMFTestCase):
content = StaticFile('startMetastore.sh'),
mode = 0755,
)
- self.assertResourceCalled('Execute', 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -initSchema -dbType mysql -userName hive -passWord asd -verbose',
- not_if = "ambari-sudo.sh su hive -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -info -dbType mysql -userName hive -passWord asd -verbose'",
+ self.assertResourceCalled('Execute', 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/hdp/current/hive-server2/bin/schematool -initSchema -dbType mysql -userName hive -passWord asd -verbose',
+ not_if = "ambari-sudo.sh su hive -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/hdp/current/hive-server2/bin/schematool -info -dbType mysql -userName hive -passWord asd -verbose'",
user = 'hive',
)
self.assertResourceCalled('Directory', '/var/run/hive',
@@ -676,11 +677,11 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('Execute', ('cp',
'--remove-destination',
'/tmp/mysql-connector-java.jar',
- '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar'),
+ '/usr/hdp/2.3.0.0-1234/hive/lib/mysql-connector-java.jar'),
path = ['/bin', '/usr/bin/'],
sudo = True)
- self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/lib/mysql-connector-java.jar',
+ self.assertResourceCalled('File', '/usr/hdp/2.3.0.0-1234/hive/lib/mysql-connector-java.jar',
mode = 0644)
self.assertResourceCalled('Execute', ('cp',
@@ -741,11 +742,11 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('Execute', ('cp',
'--remove-destination',
'/usr/share/java/mysql-connector-java.jar',
- '/usr/hdp/current/hive-metastore/lib/mysql-connector-java.jar'),
+ '/usr/hdp/2.3.2.0-2950/hive/lib/mysql-connector-java.jar'),
path = ['/bin', '/usr/bin/'],
sudo = True,
)
- self.assertResourceCalled('File', '/usr/hdp/current/hive-metastore/lib/mysql-connector-java.jar',
+ self.assertResourceCalled('File', '/usr/hdp/2.3.2.0-2950/hive/lib/mysql-connector-java.jar',
mode = 0644,
)
self.assertResourceCalled('Execute', ('cp',
@@ -845,7 +846,7 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('Execute',
('ambari-sudo.sh chown -R hive:hadoop /usr/hdp/current/hive-server2/lib/*'))
- self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/lib/sqla-client-jdbc.tar.gz',
+ self.assertResourceCalled('File', '/usr/hdp/2.3.0.0-1234/hive/lib/sqla-client-jdbc.tar.gz',
mode = 0644,
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/fac89e74/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
index b85fe90..53a854c 100644
--- a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
+++ b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
@@ -48,6 +48,8 @@ MAX_SHOWN_DICT_LEN = 10
class RMFTestCase(TestCase):
+ # provides more verbose output when comparing assertion failures
+ maxDiff = None
# (default) build all paths to test stack scripts
TARGET_STACKS = 'TARGET_STACKS'