diff --git itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java index 712af828fe..353a4aa9fa 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java +++ itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java @@ -368,6 +368,7 @@ protected void setClusterType(MiniClusterType type) { if (clusterType == null) { throw new RuntimeException("clustertype cant be null"); } + this.setFsType(clusterType.getDefaultFsType()); } protected FsType getFsType() { diff --git itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java index 6bd978144e..f28445c371 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java +++ itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java @@ -146,7 +146,6 @@ public MiniTezCliConfig() { setHiveConfDir("data/conf/tez"); setClusterType(MiniClusterType.TEZ); - setFsType(QTestMiniClusters.FsType.HDFS); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); } @@ -195,7 +194,6 @@ public MiniDruidCliConfig() { setCleanupScript("q_test_cleanup_druid.sql"); setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.DRUID); - setFsType(QTestMiniClusters.FsType.HDFS); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); } @@ -215,7 +213,6 @@ public MiniDruidKafkaCliConfig() { setCleanupScript("q_test_cleanup_druid.sql"); setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.DRUID_KAFKA); - setFsType(QTestMiniClusters.FsType.HDFS); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); } @@ -232,7 +229,6 @@ public MiniKafkaCliConfig() { setLogDir("itests/qtest/target/tmp/log"); setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.KAFKA); - setFsType(QTestMiniClusters.FsType.HDFS); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); } @@ -265,7 +261,6 @@ public MiniLlapLocalCliConfig() { setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.LLAP_LOCAL); - setFsType(QTestMiniClusters.FsType.LOCAL); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); } @@ -288,7 +283,7 @@ public EncryptedHDFSCliConfig() { setClusterType(MiniClusterType.MR); - setFsType(QTestMiniClusters.FsType.ENCRYPTED_HDFS); + setFsType(QTestMiniClusters.FsType.ENCRYPTED_HDFS); // override default FsType.HDFS if (getClusterType() == MiniClusterType.TEZ) { setHiveConfDir("data/conf/tez"); } else { @@ -723,7 +718,7 @@ public ErasureCodingHDFSCliConfig() { setCleanupScript("q_test_cleanup_src.sql"); setClusterType(MiniClusterType.MR); - setFsType(QTestMiniClusters.FsType.ERASURE_CODED_HDFS); + setFsType(QTestMiniClusters.FsType.ERASURE_CODED_HDFS); // override default FsType.HDFS setHiveConfDir(getClusterType()); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); @@ -766,7 +761,6 @@ public MiniDruidLlapLocalCliConfig() { setCleanupScript("q_test_cleanup_druid.sql"); setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.DRUID_LOCAL); - setFsType(QTestMiniClusters.FsType.LOCAL); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); } @@ -790,7 +784,6 @@ public KuduCliConfig() { setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.TEZ_LOCAL); - setFsType(QTestMiniClusters.FsType.LOCAL); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); } @@ -811,7 +804,6 @@ public KuduNegativeCliConfig() { setHiveConfDir("data/conf/llap"); setClusterType(MiniClusterType.TEZ_LOCAL); - setFsType(QTestMiniClusters.FsType.LOCAL); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); }