You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by is...@apache.org on 2018/07/26 02:09:14 UTC
[ambari] branch branch-2.7 updated (b8461bf -> 9fb4764)
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a change to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git.
from b8461bf [AMBARI-24354] [Log Search UI] wrong filter label on open log tab (#1880)
new 492e933 AMBARI-24304 Fix convert table classpath (asutosh)
new 9fb4764 AMBARI-24276 include derby jars for Hive convert table step (ashutosh)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
[ambari] 02/02: AMBARI-24276 include derby jars for Hive convert
table step (ashutosh)
Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 9fb4764c1d265a535174903fe9fe9dcda9b32ddc
Author: Miklos Gergely <mg...@hortonworks.com>
AuthorDate: Thu Jul 19 13:23:24 2018 +0200
AMBARI-24276 include derby jars for Hive convert table step (ashutosh)
---
.../common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py | 6 +++++-
1 file changed, 5 insertions(+), 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 37c099e..c9fd147 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
@@ -21,7 +21,7 @@ limitations under the License.
import os
import shutil
import traceback
-
+import glob
# Ambari Commons & Resource Management Imports
from resource_management.core.exceptions import Fail
@@ -100,6 +100,10 @@ class HivePreUpgrade(Script):
Execute(hive_kinit_cmd, user = params.hive_user)
classpath = format("{source_dir}/hive2/lib/*:{source_dir}/hadoop/*:{source_dir}/hadoop/lib/*:{source_dir}/hadoop-mapreduce/*:{source_dir}/hadoop-mapreduce/lib/*:{source_dir}/hadoop-hdfs/*:{source_dir}/hadoop-hdfs/lib/*:{source_dir}/hadoop/etc/hadoop/:{target_dir}/hive/lib/hive-pre-upgrade.jar:{source_dir}/hive/conf/conf.server")
+ # hack to avoid derby cp issue we want derby-10.10.2.0.jar to appear first in cp, if its available, note other derby jars are derbyclient-10.11.1.1.jar derbynet-10.11.1.1.jar
+ derby_jars = glob.glob(source_dir+"/hive2/lib/*derby-*.jar")
+ if len(derby_jars) == 1:
+ classpath = derby_jars[0] + ":" + classpath
cmd = format("{java64_home}/bin/java -Djavax.security.auth.useSubjectCredsOnly=false -cp {classpath} org.apache.hadoop.hive.upgrade.acid.PreUpgradeTool -execute")
Execute(cmd, user = params.hive_user)
[ambari] 01/02: AMBARI-24304 Fix convert table classpath (asutosh)
Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 492e93314e9b83d5d68d10fdc5758a6edbd48ca8
Author: Miklos Gergely <mg...@hortonworks.com>
AuthorDate: Thu Jul 19 11:43:52 2018 +0200
AMBARI-24304 Fix convert table classpath (asutosh)
---
.../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 4db8b8b..37c099e 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
@@ -99,7 +99,7 @@ class HivePreUpgrade(Script):
hive_kinit_cmd = format("{kinit_path_local} -kt {hive_server2_keytab} {hive_principal}; ")
Execute(hive_kinit_cmd, user = params.hive_user)
- classpath = format("{source_dir}/hive2/lib/*:{source_dir}/hadoop/*:{source_dir}/hadoop/lib/*:{source_dir}/hadoop-mapreduce/*:{source_dir}/hadoop-mapreduce/lib/*:{target_dir}/hive/lib/hive-pre-upgrade.jar:{source_dir}/hive/conf")
+ classpath = format("{source_dir}/hive2/lib/*:{source_dir}/hadoop/*:{source_dir}/hadoop/lib/*:{source_dir}/hadoop-mapreduce/*:{source_dir}/hadoop-mapreduce/lib/*:{source_dir}/hadoop-hdfs/*:{source_dir}/hadoop-hdfs/lib/*:{source_dir}/hadoop/etc/hadoop/:{target_dir}/hive/lib/hive-pre-upgrade.jar:{source_dir}/hive/conf/conf.server")
cmd = format("{java64_home}/bin/java -Djavax.security.auth.useSubjectCredsOnly=false -cp {classpath} org.apache.hadoop.hive.upgrade.acid.PreUpgradeTool -execute")
Execute(cmd, user = params.hive_user)