Author: khorgath
Date: Mon Jan 16 20:00:12 2012
New Revision: 1232133
URL: http://svn.apache.org/viewvc?rev=1232133&view=rev
Log:
HCATALOG-197 Data generator for e2e assumes hadoop tarball installation
(arpitgupta via khorgath)
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1232133&r1=1232132&r2=1232133&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Mon Jan 16 20:00:12 2012
@@ -99,6 +99,8 @@ Trunk (unreleased changes)
OPTIMIZATIONS
BUG FIXES
+ HCAT-197. data generator for e2e assumes hadoop tarball installation
(arpitgupta via khorgath)
+
HCAT-199. HCatOutputCommitter::cleanupJob() fails : Unable to connect to
metastore. (mithun via khorgath)
HCAT-197. data generator for e2e assumes hadoop tarball installation
(arpitgupta via hashutosh)
Modified:
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl?rev=1232133&r1=1232132&r2=1232133&view=diff
==============================================================================
---
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl
(original)
+++
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl
Mon Jan 16 20:00:12 2012
@@ -337,11 +337,13 @@ our $hadoopCoreJar = undef;
sub findHadoopJars()
{
my $hadoopClassRoot=$ENV{'HADOOP_HOME'};
- if ( -d "$hadoopClassRoot/share/hadoop" ) {
- $hadoopClassRoot="$hadoopClassRoot/share/hadoop"
+ my $coreJar = `ls $hadoopClassRoot/hadoop-core-*.jar`;
+ #if you do not find hadoop core jar under hadoop home change the path for
rpm's
+ if (! $coreJar) {
+ $hadoopClassRoot="$hadoopClassRoot/share/hadoop";
+ $coreJar = `ls $hadoopClassRoot/hadoop-core-*.jar`;
}
- my $coreJar = `ls $hadoopClassRoot/hadoop-core-*.jar`;
my $loggingJar = `ls $hadoopClassRoot/lib/commons-logging-*.jar | grep -v
api`;
my $cfgJar = `ls $hadoopClassRoot/lib/commons-configuration-*.jar`;
my $langJar = `ls $hadoopClassRoot/lib/commons-lang-*.jar`;
