HIVE-19476: Fix failures in TestReplicationScenariosAcidTables, TestReplicationOnHDFSEncryptedZones and TestCopyUtils (Sankar Hariappan, reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1b917c20 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1b917c20 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1b917c20 Branch: refs/heads/branch-3 Commit: 1b917c2048d704d68f121453b96fb7fe717668e4 Parents: 91b66c5 Author: Sankar Hariappan <sank...@apache.org> Authored: Mon May 14 00:40:22 2018 +0530 Committer: Sankar Hariappan <sank...@apache.org> Committed: Mon May 14 00:40:22 2018 +0530 ---------------------------------------------------------------------- .../hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java | 5 ++++- .../java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/1b917c20/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java index fd05e99..d8d210b 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java @@ -94,6 +94,8 @@ public class TestReplicationOnHDFSEncryptedZones { new HashMap<String, String>() {{ put(HiveConf.ConfVars.HIVE_IN_TEST.varname, "false"); put(HiveConf.ConfVars.HIVE_SERVER2_ENABLE_DOAS.varname, "false"); + put(HiveConf.ConfVars.HIVE_DISTCP_DOAS_USER.varname, + UserGroupInformation.getCurrentUser().getUserName()); }}, "test_key123"); WarehouseInstance.Tuple tuple = @@ -105,7 +107,8 @@ public class TestReplicationOnHDFSEncryptedZones { replica .run("repl load " + replicatedDbName + " from '" + tuple.dumpLocation - + "' with('hive.repl.add.raw.reserved.namespace'='true')") + + "' with('hive.repl.add.raw.reserved.namespace'='true', " + + "'distcp.options.pugpbx'='', 'distcp.options.skipcrccheck'='', 'distcp.options.update'='')") .run("use " + replicatedDbName) .run("repl status " + replicatedDbName) .verifyResult(tuple.lastReplicationId) http://git-wip-us.apache.org/repos/asf/hive/blob/1b917c20/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java index accdc1f..85a7e1b 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java @@ -123,6 +123,7 @@ public class WarehouseInstance implements Closeable { hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES, 3); hiveConf.set(HiveConf.ConfVars.PREEXECHOOKS.varname, ""); hiveConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, ""); + hiveConf.setBoolVar(HiveConf.ConfVars.HIVESTATSAUTOGATHER, false); if (!hiveConf.getVar(HiveConf.ConfVars.HIVE_TXN_MANAGER).equals("org.apache.hadoop.hive.ql.lockmgr.DbTxnManager")) { hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false"); }
