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/26 01:53:19 UTC

ambari git commit: AMBARI-17431 - Ambari Is Initializing the Metastore Using the Wrong schematool Binary on HDP 2.5 (jonathanhurley)

Repository: ambari
Updated Branches:
  refs/heads/trunk 08f62c868 -> a286924df


AMBARI-17431 - Ambari Is Initializing the Metastore Using the Wrong schematool Binary on HDP 2.5 (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a286924d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a286924d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a286924d

Branch: refs/heads/trunk
Commit: a286924dfcba17cb7ebceda65e1680c4880547e3
Parents: 08f62c8
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Jun 24 15:39:39 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Sat Jun 25 21:53:11 2016 -0400

----------------------------------------------------------------------
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a286924d/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 2afee3b..17f7380 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
@@ -99,10 +99,15 @@ hive_user_home_dir = "/home/hive"
 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')
+  # the name of the hiveserver2-hive2 component
   hive_server2_hive2_component = status_params.SERVER_ROLE_DIRECTORY_MAP["HIVE_SERVER_INTERACTIVE"]
 
+  # when using the version, we can just specify the component as "hive2"
+  hive_schematool_ver_bin = format('{stack_root}/{version}/hive2/bin')
+
+  # use the schematool which ships with hive2
+  hive_schematool_bin = format('{stack_root}/current/{hive_server2_hive2_component}/bin')
+
   # <stack-root>/<version>/hive2 (as opposed to <stack-root>/<version>/hive)
   hive_server2_hive2_dir = format('{stack_root}/current/{hive_server2_hive2_component}')