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

[khorgath]

Author: khorgath
Date: Thu Jan 12 23:58:09 2012
New Revision: 1230843

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

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

Modified: incubator/hcatalog/branches/branch-0.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.2/CHANGES.txt?rev=1230843&r1=1230842&r2=1230843&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.2/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.2/CHANGES.txt Thu Jan 12 23:58:09 2012
@@ -81,6 +81,8 @@ Release 0.2.0 - Sept-2011
   OPTIMIZATIONS
 
   BUG FIXES
+    HCAT-199. HCatOutputCommitter::cleanupJob() fails : Unable to connect to 
metastore. (mithun via khorgath)
+
     HCAT-136. Pig storer for export/import does maintain partition order 
(Krishna Kumar via hashutosh)
 
     HCAT-150. Updated documentation specifying the need to call 
HCatOutputFormat.setSchema() (chandec via toffer)

Modified: 
incubator/hcatalog/branches/branch-0.2/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.2/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java?rev=1230843&r1=1230842&r2=1230843&view=diff
==============================================================================
--- 
incubator/hcatalog/branches/branch-0.2/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
 (original)
+++ 
incubator/hcatalog/branches/branch-0.2/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
 Thu Jan 12 23:58:09 2012
@@ -436,9 +436,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
@@ -465,7 +462,11 @@ 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);