[hive] branch master updated: HIVE-26042: Fix flaky streaming tests (Peter Vary, reviewed by Marton Bod) (#3114)

[pvary]

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

pvary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 168272e  HIVE-26042: Fix flaky streaming tests (Peter Vary, reviewed 
by Marton Bod) (#3114)
168272e is described below

commit 168272eaa0898db79f2444c92a75d1fd9c4cb6ec
Author: pvary <pv...@cloudera.com>
AuthorDate: Mon Mar 21 09:36:44 2022 +0100

    HIVE-26042: Fix flaky streaming tests (Peter Vary, reviewed by Marton Bod) 
(#3114)
---
 streaming/src/test/org/apache/hive/streaming/TestStreaming.java        | 3 ++-
 .../org/apache/hive/streaming/TestStreamingDynamicPartitioning.java    | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/streaming/src/test/org/apache/hive/streaming/TestStreaming.java 
b/streaming/src/test/org/apache/hive/streaming/TestStreaming.java
index ce0b370..d8b5e0e 100644
--- a/streaming/src/test/org/apache/hive/streaming/TestStreaming.java
+++ b/streaming/src/test/org/apache/hive/streaming/TestStreaming.java
@@ -72,6 +72,7 @@ import 
org.apache.hadoop.hive.metastore.api.TableValidWriteIds;
 import org.apache.hadoop.hive.metastore.api.TxnAbortedException;
 import org.apache.hadoop.hive.metastore.api.TxnInfo;
 import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;
+import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.apache.hadoop.hive.metastore.txn.AcidHouseKeeperService;
 import org.apache.hadoop.hive.metastore.txn.TxnCommonUtils;
 import org.apache.hadoop.hive.metastore.utils.TestTxnDbUtil;
@@ -216,7 +217,7 @@ public class TestStreaming {
     conf.setBoolVar(HiveConf.ConfVars.METASTORE_EXECUTE_SET_UGI, true);
     conf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, true);
     dbFolder.create();
-
+    MetastoreConf.setVar(conf, MetastoreConf.ConfVars.WAREHOUSE, "raw://" + 
dbFolder.newFolder("warehouse"));
 
     //1) Start from a clean slate (metastore)
     TestTxnDbUtil.cleanDb(conf);
diff --git 
a/streaming/src/test/org/apache/hive/streaming/TestStreamingDynamicPartitioning.java
 
b/streaming/src/test/org/apache/hive/streaming/TestStreamingDynamicPartitioning.java
index 8dd632e..c548ea7 100644
--- 
a/streaming/src/test/org/apache/hive/streaming/TestStreamingDynamicPartitioning.java
+++ 
b/streaming/src/test/org/apache/hive/streaming/TestStreamingDynamicPartitioning.java
@@ -39,6 +39,7 @@ import org.apache.hadoop.hive.cli.CliSessionState;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.IMetaStoreClient;
+import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.apache.hadoop.hive.metastore.utils.TestTxnDbUtil;
 import org.apache.hadoop.hive.ql.DriverFactory;
 import org.apache.hadoop.hive.ql.IDriver;
@@ -134,6 +135,7 @@ public class TestStreamingDynamicPartitioning {
     conf.setBoolVar(HiveConf.ConfVars.METASTORE_EXECUTE_SET_UGI, true);
     conf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, true);
     dbFolder.create();
+    MetastoreConf.setVar(conf, MetastoreConf.ConfVars.WAREHOUSE, "raw://" + 
dbFolder.newFolder("warehouse"));
     loc1 = dbFolder.newFolder(dbName + ".db").toString();
 
     //1) Start from a clean slate (metastore)