Merge -r 709302:709303 from trunk to branch-0.19 to fix HADOOP-4498.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.19@709304 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -963,6 +963,9 @@ Release 0.19.0 - Unreleased
 
     HADOOP-4499. DFSClient should invoke checksumOk only once. (Raghu Angadi)
 
+    HADOOP-4498. Ensure that JobHistory correctly escapes the job name so that
+    regex patterns work. (Chris Wensel via acmurthy)
+
 Release 0.18.2 - Unreleased
 
   BUG FIXES

src/mapred/org/apache/hadoop/mapred/JobHistory.java

@@ -610,6 +610,10 @@ public class JobHistory {
       return jobName;
     }
     
+    private static String escapeRegexChars( String string ) {
+      return "\\Q"+string.replaceAll("\\\\E", "\\\\E\\\\\\\\E\\\\Q")+"\\E";
+    }
+
     /**
      * Recover the job history filename from the history folder. 
      * Uses the following pattern
@@ -628,6 +632,8 @@ public class JobHistory {
         return null;
       }
       
+      jobName = escapeRegexChars( jobName );
+
       // Make the pattern matching the job's history file
       final Pattern historyFilePattern = 
         Pattern.compile(jobtrackerHostname + "_" + "[0-9]+" + "_" 

src/test/org/apache/hadoop/mapred/TestJobName.java

@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.mapred;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.LongWritable;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.serializer.JavaSerializationComparator;
+import org.apache.hadoop.mapred.lib.IdentityMapper;
+
+public class TestJobName extends ClusterMapReduceTestCase {
+
+  public void testComplexName() throws Exception {
+    OutputStream os = getFileSystem().create(new Path(getInputDir(),
+        "text.txt"));
+    Writer wr = new OutputStreamWriter(os);
+    wr.write("b a\n");
+    wr.close();
+
+    JobConf conf = createJobConf();
+    conf.setJobName("[name][some other value that gets truncated internally that this test attempts to aggravate]");
+
+    conf.setInputFormat(TextInputFormat.class);
+
+    conf.setOutputKeyClass(LongWritable.class);
+    conf.setOutputValueClass(Text.class);
+
+    conf.setMapperClass(IdentityMapper.class);
+
+    FileInputFormat.setInputPaths(conf, getInputDir());
+
+    FileOutputFormat.setOutputPath(conf, getOutputDir());
+
+    JobClient.runJob(conf);
+
+    Path[] outputFiles = FileUtil.stat2Paths(
+                           getFileSystem().listStatus(getOutputDir(),
+                           new OutputLogFilter()));
+    assertEquals(1, outputFiles.length);
+    InputStream is = getFileSystem().open(outputFiles[0]);
+    BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+    assertEquals("0\tb a", reader.readLine());
+    assertNull(reader.readLine());
+    reader.close();
+  }
+
+  public void testComplexNameWithRegex() throws Exception {
+    OutputStream os = getFileSystem().create(new Path(getInputDir(),
+        "text.txt"));
+    Writer wr = new OutputStreamWriter(os);
+    wr.write("b a\n");
+    wr.close();
+
+    JobConf conf = createJobConf();
+    conf.setJobName("name \\Evalue]");
+
+    conf.setInputFormat(TextInputFormat.class);
+
+    conf.setOutputKeyClass(LongWritable.class);
+    conf.setOutputValueClass(Text.class);
+
+    conf.setMapperClass(IdentityMapper.class);
+
+    FileInputFormat.setInputPaths(conf, getInputDir());
+
+    FileOutputFormat.setOutputPath(conf, getOutputDir());
+
+    JobClient.runJob(conf);
+
+    Path[] outputFiles = FileUtil.stat2Paths(
+                           getFileSystem().listStatus(getOutputDir(),
+                           new OutputLogFilter()));
+    assertEquals(1, outputFiles.length);
+    InputStream is = getFileSystem().open(outputFiles[0]);
+    BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+    assertEquals("0\tb a", reader.readLine());
+    assertNull(reader.readLine());
+    reader.close();
+  }
+
+}