From hcatalog-commits-return-594-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Thu Jan 12 23:58:08 2012 Return-Path: X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AA3EFB714 for ; Thu, 12 Jan 2012 23:58:08 +0000 (UTC) Received: (qmail 51858 invoked by uid 500); 12 Jan 2012 23:58:08 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 51814 invoked by uid 500); 12 Jan 2012 23:58:07 -0000 Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hcatalog-dev@incubator.apache.org Delivered-To: mailing list hcatalog-commits@incubator.apache.org Received: (qmail 51807 invoked by uid 99); 12 Jan 2012 23:58:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jan 2012 23:58:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jan 2012 23:58:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3625E23888CD; Thu, 12 Jan 2012 23:57:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1230842 - in /incubator/hcatalog/trunk: CHANGES.txt src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java Date: Thu, 12 Jan 2012 23:57:46 -0000 To: hcatalog-commits@incubator.apache.org From: khorgath@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120112235746.3625E23888CD@eris.apache.org> Author: khorgath Date: Thu Jan 12 23:57:45 2012 New Revision: 1230842 URL: http://svn.apache.org/viewvc?rev=1230842&view=rev Log: HCATALOG-199 HCatOutputCommitter::cleanupJob() fails : Unable to connect to metastore. Modified: incubator/hcatalog/trunk/CHANGES.txt incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java Modified: incubator/hcatalog/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1230842&r1=1230841&r2=1230842&view=diff ============================================================================== --- incubator/hcatalog/trunk/CHANGES.txt (original) +++ incubator/hcatalog/trunk/CHANGES.txt Thu Jan 12 23:57:45 2012 @@ -93,6 +93,8 @@ Trunk (unreleased changes) OPTIMIZATIONS BUG FIXES + 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) HCAT-202. ant clean target is failing (thw via hashutosh) Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java?rev=1230842&r1=1230841&r2=1230842&view=diff ============================================================================== --- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java (original) +++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java Thu Jan 12 23:57:45 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);