Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 8D3D19B83 for ; Wed, 28 Dec 2011 18:25:35 +0000 (UTC) Received: (qmail 61944 invoked by uid 500); 28 Dec 2011 18:25:35 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 61913 invoked by uid 500); 28 Dec 2011 18:25:35 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 61906 invoked by uid 99); 28 Dec 2011 18:25:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Dec 2011 18:25:35 +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; Wed, 28 Dec 2011 18:25:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D27DF2388A36 for ; Wed, 28 Dec 2011 18:25:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1225261 - in /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src: main/java/org/apache/hadoop/streaming/StreamUtil.java test/java/org/apache/hadoop/streaming/TestMRFramework.java Date: Wed, 28 Dec 2011 18:25:13 -0000 To: common-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111228182513.D27DF2388A36@eris.apache.org> Author: acmurthy Date: Wed Dec 28 18:25:13 2011 New Revision: 1225261 URL: http://svn.apache.org/viewvc?rev=1225261&view=rev Log: Merge -c 1225259 from trunk to branch-0.23 to fix MAPREDUCE-3604. Added: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMRFramework.java - copied unchanged from r1225259, hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMRFramework.java Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamUtil.java Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamUtil.java?rev=1225261&r1=1225260&r2=1225261&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamUtil.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamUtil.java Wed Dec 28 18:25:13 2011 @@ -18,16 +18,19 @@ package org.apache.hadoop.streaming; -import java.io.*; -import java.net.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URL; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FSDataInputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; +import org.apache.hadoop.mapreduce.MRConfig; /** * Utilities used in streaming @@ -189,6 +192,8 @@ public class StreamUtil { } public static boolean isLocalJobTracker(JobConf job) { - return job.get(JTConfig.JT_IPC_ADDRESS, "local").equals("local"); + String framework = + job.get(MRConfig.FRAMEWORK_NAME, MRConfig.LOCAL_FRAMEWORK_NAME); + return framework.equals(MRConfig.LOCAL_FRAMEWORK_NAME); } }