merge -r 1368295:1368296 from branch-2. FIXES: MAPREDUCE-4504

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1368298 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -379,6 +379,9 @@ Release 0.23.3 - UNRELEASED
     parallel use (due to a /tmp file with static name) (Robert Evans via
     jeagles)
 
+    MAPREDUCE-4504. SortValidator writes to wrong directory (Robert Evans 
+    via tgraves)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

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

@@ -344,7 +344,7 @@ public class SortValidator extends Configured implements Tool {
 
       FileInputFormat.setInputPaths(jobConf, sortInput);
       FileInputFormat.addInputPath(jobConf, sortOutput);
-      Path outputPath = new Path(new Path(jobConf.get("hadoop.tmp.dir", "/tmp"),
+      Path outputPath = new Path(new Path("/tmp",
            "sortvalidate"), UUID.randomUUID().toString());
       if (defaultfs.exists(outputPath)) {
         defaultfs.delete(outputPath, true);

hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java

@@ -344,7 +344,7 @@ public class SortValidator extends Configured implements Tool {
 
       FileInputFormat.setInputPaths(jobConf, sortInput);
       FileInputFormat.addInputPath(jobConf, sortOutput);
-      Path outputPath = new Path(new Path(jobConf.get("hadoop.tmp.dir", "/tmp"),
+      Path outputPath = new Path(new Path("/tmp",
            "sortvalidate"), UUID.randomUUID().toString());
       if (defaultfs.exists(outputPath)) {
         defaultfs.delete(outputPath, true);