You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2008/05/29 18:28:42 UTC

svn commit: r661386 - in /hadoop/core/trunk: CHANGES.txt src/test/org/apache/hadoop/io/FileBench.java

Author: omalley
Date: Thu May 29 09:28:42 2008
New Revision: 661386

URL: http://svn.apache.org/viewvc?rev=661386&view=rev
Log:
HADOOP-3401. Update FileBench to set the new "mapred.work.output.dir" 
property to work post-3041. Contributed by Chris Douglas.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/test/org/apache/hadoop/io/FileBench.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=661386&r1=661385&r2=661386&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu May 29 09:28:42 2008
@@ -348,6 +348,9 @@
     HADOOP-3451. Update libhdfs to use FileSystem::getFileBlockLocations
     instead of removed getFileCacheHints. (lohit vijayarenu via cdouglas)
 
+    HADOOP-3401. Update FileBench to set the new
+    "mapred.work.output.dir" property to work post-3041. (cdouglas via omalley)
+ 
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/io/FileBench.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/io/FileBench.java?rev=661386&r1=661385&r2=661386&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/io/FileBench.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/io/FileBench.java Thu May 29 09:28:42 2008
@@ -108,6 +108,7 @@
 
     final String fn = conf.get("test.filebench.name", "");
     final Path outd = FileOutputFormat.getOutputPath(conf);
+    conf.set("mapred.work.output.dir", outd.toString());
     OutputFormat outf = conf.getOutputFormat();
     RecordWriter<Text,Text> rw =
       outf.getRecordWriter(outd.getFileSystem(conf), conf, fn,
@@ -191,7 +192,9 @@
       }
     }
     if (null == root) {
-      throw new IOException("Missing -dir param");
+      System.out.println("Missing -dir param");
+      printUsage();
+      return -1;
     }
 
     fillBlocks(job);