Merge -r 732608:732609 from trunk onto 0.20 branch. Fixes HADOOP-4847.

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

CHANGES.txt

@@ -541,6 +541,9 @@ Release 0.19.1 - Unreleased
     HADOOP-4821. Usage description in the Quotas guide documentations are
     incorrect. (Boris Shkolnik via hairong)
 
+    HADOOP-4847. Moves the loading of OutputCommitter to the Task.
+    (Amareshwari Sriramadasu via ddas)
+
 Release 0.19.0 - 2008-11-18
 
   INCOMPATIBLE CHANGES

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

@@ -295,18 +295,6 @@ abstract class Task implements Writable, Configurable {
     conf.setBoolean("mapred.task.is.map", isMapTask());
     conf.setInt("mapred.task.partition", partition);
     conf.set("mapred.job.id", taskId.getJobID().toString());
-    Path outputPath = FileOutputFormat.getOutputPath(conf);
-    if (outputPath != null) {
-      OutputCommitter committer = conf.getOutputCommitter();
-      if ((committer instanceof FileOutputCommitter)) {
-        TaskAttemptContext context = new TaskAttemptContext(conf, taskId);
-        FileOutputFormat.setWorkOutputPath(conf, 
-          ((FileOutputCommitter)committer).getTempTaskOutputPath(context));
-      } else {
-        FileOutputFormat.setWorkOutputPath(conf, outputPath);
-      }
-    }
-
   }
   
   /** Run this task as a part of the named job.  This method is executed in the
@@ -352,6 +340,15 @@ abstract class Task implements Writable, Configurable {
     } else {
       committer = conf.getOutputCommitter();
     }
+    Path outputPath = FileOutputFormat.getOutputPath(conf);
+    if (outputPath != null) {
+      if ((committer instanceof FileOutputCommitter)) {
+        FileOutputFormat.setWorkOutputPath(conf, 
+          ((FileOutputCommitter)committer).getTempTaskOutputPath(taskContext));
+      } else {
+        FileOutputFormat.setWorkOutputPath(conf, outputPath);
+      }
+    }
     committer.setupTask(taskContext);
   }
   

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

@@ -0,0 +1,65 @@
+/* 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 junit.framework.TestCase;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.*;
+import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+
+public class TestCustomOutputCommitter extends TestCase {
+  static final Path input = new Path("/test/input/");
+  static final Path output = new Path("/test/output");
+  
+  public void testCommitter() throws Exception {
+    MiniDFSCluster dfs = null;
+    MiniMRCluster mr = null;
+    FileSystem fs = null;
+    Path testFile = new Path(input, "testfile");
+    try {
+      Configuration conf = new Configuration();
+
+      //start the mini mr and dfs cluster.
+      dfs = new MiniDFSCluster(conf, 2 , true, null);
+      fs = dfs.getFileSystem();
+      FSDataOutputStream stream = fs.create(testFile);
+      stream.write("teststring".getBytes());
+      stream.close();
+
+      mr = new MiniMRCluster(2, fs.getUri().toString(), 1);
+
+      String[] args = new String[6];
+      args[0] = "-libjars";
+      // the testjob.jar as a temporary jar file 
+      // holding custom output committer
+      args[1] = "build/test/testjar/testjob.jar";
+      args[2] = "-D";
+      args[3] = "mapred.output.committer.class=testjar.CustomOutputCommitter";
+      args[4] = input.toString();
+      args[5] = output.toString();
+      JobConf jobConf = mr.createJobConf();
+      int ret = ToolRunner.run(jobConf, new WordCount(), args);
+
+      assertTrue("not failed ", ret == 0);
+    } finally {
+      if (dfs != null) {dfs.shutdown();};
+      if (mr != null) {mr.shutdown();};
+    }
+  }
+}

src/test/testjar/CustomOutputCommitter.java

@@ -0,0 +1,25 @@
+/**
+ * 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 testjar;
+
+import org.apache.hadoop.mapred.FileOutputCommitter;
+
+public class CustomOutputCommitter extends FileOutputCommitter {
+  // custom output committer with default implementation
+}