MAPREDUCE-7502. TestPipeApplication silently hangs

Closes #7902

Signed-off-by: Shilun Fan <[email protected]>
Signed-off-by: Chris Nauroth <[email protected]>
(cherry picked from commit 631939f)

Author: stoty

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Application.java

@@ -110,7 +110,8 @@ class Application<K1 extends WritableComparable, V1 extends Writable,
     String localPasswordFile = new File(".") + Path.SEPARATOR
         + "jobTokenPassword";
     writePasswordToLocalFile(localPasswordFile, password, conf);
-    env.put("hadoop.pipes.shared.secret.location", localPasswordFile);
+    // FIXME This doesn't seem to be read anywhere
+    env.put("hadoop_pipes_shared_secret_location", localPasswordFile);
 
     List<String> cmd = new ArrayList<String>();
     String interpretor = conf.get(Submitter.INTERPRETOR);

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Submitter.java

@@ -82,7 +82,9 @@ public class Submitter extends Configured implements Tool {
   public static final String IS_JAVA_REDUCE = "mapreduce.pipes.isjavareducer";
   public static final String PARTITIONER = "mapreduce.pipes.partitioner";
   public static final String INPUT_FORMAT = "mapreduce.pipes.inputformat";
-  public static final String PORT = "mapreduce.pipes.command.port";
+  // This is used as an environment variable, which doesn't allow dots.
+  // FIXME This also seems to be used only for tests
+  public static final String PORT = "mapreduce_pipes_command_port";
 
   public Submitter() {
     this(new Configuration());

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/CommonStub.java

@@ -99,7 +99,7 @@ protected void writeObject(Writable obj, DataOutputStream stream)
   }
 
   protected void initSoket() throws Exception {
-    int port = Integer.parseInt(System.getenv("mapreduce.pipes.command.port"));
+    int port = Integer.parseInt(System.getenv(Submitter.PORT));
 
     java.net.InetAddress address = java.net.InetAddress.getLocalHost();