hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
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 GMT
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);
   }
 }



Mime
View raw message