svn commit: r1230844 - in /incubator/hcatalog/branches/branch-0.3: CHANGES.txt src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java

[khorgath]

Author: khorgath
Date: Thu Jan 12 23:58:14 2012
New Revision: 1230844

URL: http://svn.apache.org/viewvc?rev=1230844&view=rev
Log:
HCATALOG-199 HCatOutputCommitter::cleanupJob() fails : Unable to connect to 
metastore.

Modified:
    incubator/hcatalog/branches/branch-0.3/CHANGES.txt
    
incubator/hcatalog/branches/branch-0.3/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java

Modified: incubator/hcatalog/branches/branch-0.3/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.3/CHANGES.txt?rev=1230844&r1=1230843&r2=1230844&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.3/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.3/CHANGES.txt Thu Jan 12 23:58:14 2012
@@ -91,6 +91,8 @@ Release 0.3.0 (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-199. HCatOutputCommitter::cleanupJob() fails : Unable to connect to 
metastore. (mithun via khorgath)
+
   HCAT-202. ant clean target is failing (thw via toffer)
 
   HCAT-200. e2e test build.xml does not work with rpms (arpitgupta via 
khorgath)

Modified: 
incubator/hcatalog/branches/branch-0.3/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.3/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java?rev=1230844&r1=1230843&r2=1230844&view=diff
==============================================================================
--- 
incubator/hcatalog/branches/branch-0.3/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
 (original)
+++ 
incubator/hcatalog/branches/branch-0.3/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
 Thu Jan 12 23:58:14 2012
@@ -261,9 +261,6 @@ public class HCatOutputFormat extends HC
             hiveConf.setBoolean(ConfVars.METASTORE_USE_THRIFT_SASL.varname, 
true);
             hiveConf.set(ConfVars.METASTORE_KERBEROS_PRINCIPAL.varname, 
kerberosPrincipal);
         }
-        if(conf.get(HCatConstants.HCAT_KEY_TOKEN_SIGNATURE) != null) {
-          hiveConf.set("hive.metastore.token.signature", 
conf.get(HCatConstants.HCAT_KEY_TOKEN_SIGNATURE));
-        }
       } else {
         //Thrift url is null, copy the hive conf into the job conf and restore 
it
         //in the backend context
@@ -291,6 +288,10 @@ public class HCatOutputFormat extends HC
 
       }
 
+      if(conf.get(HCatConstants.HCAT_KEY_TOKEN_SIGNATURE) != null) {
+        hiveConf.set("hive.metastore.token.signature", 
conf.get(HCatConstants.HCAT_KEY_TOKEN_SIGNATURE));
+      }
+
       // figure out what the maximum number of partitions allowed is, so we 
can pass it on to our outputinfo
       if (HCatConstants.HCAT_IS_DYNAMIC_MAX_PTN_CHECK_ENABLED){
         maxDynamicPartitions = 
hiveConf.getIntVar(HiveConf.ConfVars.DYNAMICPARTITIONMAXPARTS);