[ambari] branch branch-2.7 updated: AMBARI-24970 Set Hive pre-upgrade threshold for using Hive 1 jars to 3.1

[mgergely]

This is an automated email from the ASF dual-hosted git repository.

mgergely pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 21f51eb  AMBARI-24970 Set Hive pre-upgrade threshold for using Hive 1 
jars to 3.1
21f51eb is described below

commit 21f51eb533fe69f65201aed612367c105d4e9465
Author: Miklos Gergely <mgerg...@hortonworks.com>
AuthorDate: Thu Nov 29 09:57:03 2018 +0100

    AMBARI-24970 Set Hive pre-upgrade threshold for using Hive 1 jars to 3.1
---
 .../common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
index 7dbdf1e..00f7c4a 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
@@ -101,7 +101,7 @@ class HivePreUpgrade(Script):
       Execute(hive_kinit_cmd, user = params.hive_user)
     
     # in the M10 release PreUpgradeTool was fixed to use Hive1 instead of 
Hive2 
-    if target_version >= "3.0.3":
+    if target_version >= "3.1":
       hive_lib_dir = format("{source_dir}/hive/lib")
     else:
       hive_lib_dir = format("{source_dir}/hive2/lib")