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 3E31E1109A for ; Sun, 22 Jun 2014 03:08:33 +0000 (UTC) Received: (qmail 54442 invoked by uid 500); 22 Jun 2014 03:08:33 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 54403 invoked by uid 500); 22 Jun 2014 03:08:33 -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 54394 invoked by uid 99); 22 Jun 2014 03:08:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jun 2014 03:08:33 +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, 22 Jun 2014 03:08:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 703302388906; Sun, 22 Jun 2014 03:08:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1604513 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java Date: Sun, 22 Jun 2014 03:08:09 -0000 To: commits@pig.apache.org From: daijy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140622030809.703302388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: daijy Date: Sun Jun 22 03:08:08 2014 New Revision: 1604513 URL: http://svn.apache.org/r1604513 Log: PIG-4021: Fix TestHBaseStorage failure after auto local mode change (PIG-3463) Modified: pig/trunk/CHANGES.txt pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java Modified: pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1604513&r1=1604512&r2=1604513&view=diff ============================================================================== --- pig/trunk/CHANGES.txt (original) +++ pig/trunk/CHANGES.txt Sun Jun 22 03:08:08 2014 @@ -211,6 +211,8 @@ PIG-3882: Multiquery off mode execution BUG FIXES +PIG-4021: Fix TestHBaseStorage failure after auto local mode change (PIG-3463) (daijy) + PIG-4029: TestMRCompiler is broken after PIG-3874 (daijy) PIG-4030: TestGrunt, TestPigRunner fail after PIG-3892 (daijy) Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java?rev=1604513&r1=1604512&r2=1604513&view=diff ============================================================================== --- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java (original) +++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java Sun Jun 22 03:08:08 2014 @@ -110,14 +110,6 @@ public abstract class HExecutionEngine i public JobConf getLocalConf(Properties properties) { JobConf jc = new JobConf(false); - // If we are running in local mode we dont read the hadoop conf file - if (properties.getProperty(MAPREDUCE_FRAMEWORK_NAME) == null) { - jc.set(MAPREDUCE_FRAMEWORK_NAME, LOCAL); - } - jc.set(JOB_TRACKER_LOCATION, LOCAL); - jc.set(FILE_SYSTEM_LOCATION, "file:///"); - jc.set(ALTERNATIVE_FILE_SYSTEM_LOCATION, "file:///"); - jc.addResource(MAPRED_DEFAULT_SITE); jc.addResource(YARN_DEFAULT_SITE); jc.addResource(CORE_DEFAULT_SITE); @@ -182,6 +174,14 @@ public abstract class HExecutionEngine i // add hdfs-default.xml into configuration new DistributedFileSystem(); } else { + // If we are running in local mode we dont read the hadoop conf file + if (properties.getProperty(MAPREDUCE_FRAMEWORK_NAME) == null) { + properties.setProperty(MAPREDUCE_FRAMEWORK_NAME, LOCAL); + } + properties.setProperty(JOB_TRACKER_LOCATION, LOCAL); + properties.setProperty(FILE_SYSTEM_LOCATION, "file:///"); + properties.setProperty(ALTERNATIVE_FILE_SYSTEM_LOCATION, "file:///"); + jc = getLocalConf(properties); }