Return-Path: X-Original-To: apmail-pig-commits-archive@www.apache.org Delivered-To: apmail-pig-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3FF35D8C9 for ; Sun, 21 Oct 2012 00:03:32 +0000 (UTC) Received: (qmail 82573 invoked by uid 500); 21 Oct 2012 00:03:32 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 82460 invoked by uid 500); 21 Oct 2012 00:03:31 -0000 Mailing-List: contact commits-help@pig.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pig.apache.org Delivered-To: mailing list commits@pig.apache.org Received: (qmail 82147 invoked by uid 99); 21 Oct 2012 00:03:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Oct 2012 00:03:31 +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; Sun, 21 Oct 2012 00:03:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 51DC223888FE for ; Sun, 21 Oct 2012 00:02:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1400538 - in /pig/trunk: CHANGES.txt src/org/apache/pig/impl/util/UDFContext.java Date: Sun, 21 Oct 2012 00:02:47 -0000 To: commits@pig.apache.org From: daijy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121021000247.51DC223888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: daijy Date: Sun Oct 21 00:02:46 2012 New Revision: 1400538 URL: http://svn.apache.org/viewvc?rev=1400538&view=rev Log: PIG-2940: HBaseStorage store fails in secure cluster Modified: pig/trunk/CHANGES.txt pig/trunk/src/org/apache/pig/impl/util/UDFContext.java Modified: pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1400538&r1=1400537&r2=1400538&view=diff ============================================================================== --- pig/trunk/CHANGES.txt (original) +++ pig/trunk/CHANGES.txt Sun Oct 21 00:02:46 2012 @@ -641,6 +641,8 @@ PIG-2228: support partial aggregation in BUG FIXES +PIG-2940: HBaseStorage store fails in secure cluster (rohini via daijy) + PIG-2821: HBaseStorage should work with secure hbase (rohini via daijy) PIG-2859: Fix few e2e test failures (rohini via daijy) Modified: pig/trunk/src/org/apache/pig/impl/util/UDFContext.java URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/UDFContext.java?rev=1400538&r1=1400537&r2=1400538&view=diff ============================================================================== --- pig/trunk/src/org/apache/pig/impl/util/UDFContext.java (original) +++ pig/trunk/src/org/apache/pig/impl/util/UDFContext.java Sun Oct 21 00:02:46 2012 @@ -211,7 +211,11 @@ public class UDFContext { * @return */ public boolean isFrontend() { - return (this.jconf == null || jconf.get("mapred.task.id") == null); + // mapred.task.id is for MR1 + // mapreduce.job.application.attempt.id is for MR2 + return (this.jconf == null + || (jconf.get("mapred.task.id") == null && + jconf.get("mapreduce.job.application.attempt.id") == null)); } /**