You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by vi...@apache.org on 2020/02/15 06:41:23 UTC
[impala] branch master updated: Revert "IMPALA-9287: Add support
for embedded HMS in CDP builds"
This is an automated email from the ASF dual-hosted git repository.
vihangk1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new 4f0f870 Revert "IMPALA-9287: Add support for embedded HMS in CDP builds"
4f0f870 is described below
commit 4f0f8701a1ac25ce4ab9df1edffab62adb07d945
Author: Vihang Karajgaonkar <vi...@cloudera.com>
AuthorDate: Fri Feb 14 14:44:25 2020 -0800
Revert "IMPALA-9287: Add support for embedded HMS in CDP builds"
This reverts commit 55612f99910414b01627c537203737d8f24971bf.
Change-Id: Ib8ef0241ffe165be2bfe7eac114f1b0fbabc5f29
Reviewed-on: http://gerrit.cloudera.org:8080/15227
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
bin/bootstrap_system.sh | 6 -----
fe/pom.xml | 29 +++-------------------
fe/src/test/resources/hive-site.xml.py | 4 ---
.../test_kudu_table_create_without_hms.py | 1 +
4 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/bin/bootstrap_system.sh b/bin/bootstrap_system.sh
index fca2ad6..c6ef1d1 100755
--- a/bin/bootstrap_system.sh
+++ b/bin/bootstrap_system.sh
@@ -312,12 +312,6 @@ redhat sudo sed -ri 's/local +all +all +ident/local all all trust/g' \
# Accept md5 passwords from localhost
redhat sudo sed -i -e 's,\(host.*\)ident,\1md5,' /var/lib/pgsql/data/pg_hba.conf
-# Modfiy pg max connections to 500 for IMPALA-9287
-ubuntu sudo sed -i 's/\(max_connections = \)\S*/\1500/g' \
- /etc/postgresql/*/main/postgresql.conf
-redhat sudo sed -i 's/\(max_connections = \)\S*/\1500/g' \
- /var/lib/pgsql/data/postgresql.conf
-
ubuntu sudo service postgresql start
redhat6 sudo service postgresql start
redhat7 notindocker sudo service postgresql start
diff --git a/fe/pom.xml b/fe/pom.xml
index da1fdb8..f861096 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -1226,12 +1226,13 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <!-- IMPALA-9287: Needed when catalogd used embedded HMS-->
+ <!-- Needed by tests like TestCaseLoader instantiate HMS in embedded mode which
+ needs datanucleus as test dependency-->
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>javax.jdo</artifactId>
<version>3.2.0-m3</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<!-- IMPALA-8766: Include Knox jars on the classpath -->
<dependency>
@@ -1246,30 +1247,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
- <!-- IMPALA-9287: Needed when catalogd used embedded HMS-->
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- <version>${hive.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <!-- Impala uses log4j v1; avoid pulling in slf4j handling for log4j2 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <!-- https://issues.apache.org/jira/browse/HADOOP-14903 -->
- <exclusion>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</profile>
diff --git a/fe/src/test/resources/hive-site.xml.py b/fe/src/test/resources/hive-site.xml.py
index 6566d93..d4f4b77 100644
--- a/fe/src/test/resources/hive-site.xml.py
+++ b/fe/src/test/resources/hive-site.xml.py
@@ -162,10 +162,6 @@ CONFIG.update({
if variant == 'without_hms_config':
CONFIG.clear()
- if hive_major_version >= 3:
- CONFIG.update({
- 'metastore.expression.proxy': 'org.apache.hadoop.hive.metastore.DefaultPartitionExpressionProxy'
- })
# Database and JDO-related configs:
db_type = os.environ.get('HMS_DB_TYPE', 'postgres')
diff --git a/tests/custom_cluster/test_kudu_table_create_without_hms.py b/tests/custom_cluster/test_kudu_table_create_without_hms.py
index acbd3b1..cfe957e 100644
--- a/tests/custom_cluster/test_kudu_table_create_without_hms.py
+++ b/tests/custom_cluster/test_kudu_table_create_without_hms.py
@@ -29,6 +29,7 @@ TBL_NAME = "test_kudu_table_create_without_hms"
class TestCreatingKuduTableWithoutHMS(CustomClusterTestSuite):
"""Test creating kudu managed table without hms"""
+ @SkipIfHive3.without_hms_not_supported
@pytest.mark.execute_serially
@CustomClusterTestSuite.with_args(hive_conf_dir=HIVE_SITE_WITHOUT_HMS_DIR)
def test_kudu_table_create_without_hms(self, unique_database):