HCAT-507 e2e harness failing on 0.23 (toffer)
git-svn-id: https://svn.apache.org/repos/asf/incubator/hcatalog/trunk@1388158 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 716b6e7..d0ac4a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -111,6 +111,8 @@
OPTIMIZATIONS
BUG FIXES
+ HCAT-507 e2e harness failing on 0.23 (toffer)
+
HCAT-502 HCatalog dependency resolution fails due to missing repo (traviscrawford)
HCAT-490 HCatStorer() throws error when the same partition key is present in records in more than one tasks running as part of the same job (amalakar via traviscrawford)
diff --git a/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm b/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
index e352fa3..8ac7a0b 100644
--- a/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
+++ b/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
@@ -184,7 +184,11 @@
# }
# Create the HDFS directories
- Util::runHadoopCmd($cfg, $log, "fs -mkdir $cfg->{'hcat_data_dir'}");
+ my $mkdirCmd = "fs -mkdir";
+ if ($ENV{'HCAT_HADOOPVERSION'} eq "23") {
+ $mkdirCmd = "fs -mkdir -p"
+ }
+ Util::runHadoopCmd($cfg, $log, "$mkdirCmd $cfg->{'hcat_data_dir'}");
foreach my $table (@tables) {
print "Generating data for $table->{'name'}\n";
@@ -200,12 +204,12 @@
$self->runCmd($log, \@cmd);
# Copy the data to HDFS
- my $hadoop = "fs -mkdir $cfg->{'hcat_data_dir'}/$table->{'hdfs'}";
+ my $hadoop = "$mkdirCmd $cfg->{'hcat_data_dir'}/$table->{'hdfs'}";
Util::runHadoopCmd($cfg, $log, $hadoop);
if (defined($table->{'partitions'})) {
foreach my $part (@{$table->{'partitions'}}) {
- my $hadoop = "fs -mkdir
+ my $hadoop = "$mkdirCmd
$cfg->{'hcat_data_dir'}/$table->{'hdfs'}/$table->{'name'}.$part";
Util::runHadoopCmd($cfg, $log, $hadoop);
my $hadoop = "fs -copyFromLocal $table->{'name'}.$part " .
diff --git a/src/test/e2e/hcatalog/tools/generate/java/build.xml b/src/test/e2e/hcatalog/tools/generate/java/build.xml
index 11337d8..1b5c33d 100644
--- a/src/test/e2e/hcatalog/tools/generate/java/build.xml
+++ b/src/test/e2e/hcatalog/tools/generate/java/build.xml
@@ -23,7 +23,7 @@
<path id="generator-classpath">
<fileset file="${hive.serde.jarfile}"/>
<fileset file="${hive.ql.jarfile}"/>
- <fileset file="${hadoop.core.jarfile}"/>
+ <pathelement path="${hadoop.core.jarfile}" />
</path>
<target name="init">
