svn commit: r1177836 - in /incubator/hcatalog/trunk: CHANGES.txt src/test/e2e/hcatalog/drivers/TestDriverHCat.pm

[hashutosh]

Author: hashutosh
Date: Fri Sep 30 21:01:15 2011
New Revision: 1177836

URL: http://svn.apache.org/viewvc?rev=1177836&view=rev
Log:
Harness incorrectly assumes secure mode

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1177836&r1=1177835&r2=1177836&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Fri Sep 30 21:01:15 2011
@@ -51,6 +51,8 @@ Trunk (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-117. Harness incorrectly assumes secure mode (khorgath via hashutosh) 
+
   HCAT-113. rpm name not properly reflecting the version number (gates via 
hashutosh)
 
   HCAT-112. install scripts assumes bash shell but don't set it explictly 
(hashutosh)

Modified: 
incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm?rev=1177836&r1=1177835&r2=1177836&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm 
(original)
+++ incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm 
Fri Sep 30 21:01:15 2011
@@ -445,9 +445,11 @@ sub runHive
     push(@cmd, "--hiveconf hive.metastore.local=false --hiveconf 
hive.metastore.uris=thrift://".$testCmd->{'thriftserver'});
    
    
- if(defined($testCmd->{'metastore.principal'})){
-     push(@cmd, "--hiveconf hive.metastore.sasl.enabled=true  --hiveconf 
hive.metastore.kerberos.principal=$testCmd->{'metastore.principal'}");
-
+    if( defined($testCmd->{'metastore.principal'}) && 
($testCmd->{'metastore.principal'} =~ m/\S+/) 
+        &&  ($testCmd->{'metastore.principal'} ne '${metastore.principal}')){
+        push(@cmd, "--hiveconf hive.metastore.sasl.enabled=true  --hiveconf 
hive.metastore.kerberos.principal=$testCmd->{'metastore.principal'}");
+    } else {
+        push(@cmd, "--hiveconf hive.metastore.sasl.enabled=false");
     }
 
     # Add hive command file
@@ -631,9 +633,13 @@ sub runHadoopCmdLine
         $ENV{'HADOOP_CLASSPATH'} = $ENV{'HCAT_EXTRA_JARS'};
     }
     my $hadoop_opts = 
"-Dhive.metastore.uris=thrift://".$testCmd->{'thriftserver'}." 
-Dhcat.metastore.uri=thrift://".$testCmd->{'thriftserver'};
-    if (defined($testCmd->{'metastore.principal'})){
-       $hadoop_opts = join '',$hadoop_opts," 
-Dhive.metastore.sasl.enabled=true 
-Dhcat.metastore.principal=",$testCmd->{'metastore.principal'}," 
-Dhive.metastore.kerberos.principal=",$testCmd->{'metastore.principal'};
-    }    
+    if( defined($testCmd->{'metastore.principal'}) && 
($testCmd->{'metastore.principal'} =~ m/\S+/)
+        &&  ($testCmd->{'metastore.principal'} ne '${metastore.principal}')){
+       $hadoop_opts = join '',$hadoop_opts," 
-Dhive.metastore.sasl.enabled=true -Dhcat.metastore.principal=",
+                            $testCmd->{'metastore.principal'}," 
-Dhive.metastore.kerberos.principal=",$testCmd->{'metastore.principal'};
+    } else {
+        $hadoop_opts = join '',$hadoop_opts," 
-Dhive.metastore.sasl.enabled=false";
+    }
     $ENV{'HADOOP_OPTS'} = $hadoop_opts;
     # Run the command
     print $log "$0:$subName Going to run command: $command\n";
@@ -852,8 +858,12 @@ sub runPig
     push(@cmd, $locallog);
     
     my $pig_opts = 
"-Dhive.metastore.uris=thrift://".$testCmd->{'thriftserver'}." 
-Dhcat.metastore.uri=thrift://".$testCmd->{'thriftserver'};
-    if (defined($testCmd->{'metastore.principal'})){
-       $pig_opts = join '',$pig_opts," -Dhive.metastore.sasl.enabled=true 
-Dhcat.metastore.principal=",$testCmd->{'metastore.principal'}," 
-Dhive.metastore.kerberos.principal=",$testCmd->{'metastore.principal'};
+    if( defined($testCmd->{'metastore.principal'}) && 
($testCmd->{'metastore.principal'} =~ m/\S+/)
+         &&  ($testCmd->{'metastore.principal'} ne '${metastore.principal}')){
+       $pig_opts = join '',$pig_opts," -Dhive.metastore.sasl.enabled=true 
-Dhcat.metastore.principal=",
+                         $testCmd->{'metastore.principal'}," 
-Dhive.metastore.kerberos.principal=",$testCmd->{'metastore.principal'};
+    } else {
+        $pig_opts = join '',$pig_opts," -Dhive.metastore.sasl.enabled=false";
     }    
     $ENV{'PIG_OPTS'} = $pig_opts;