hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r667022 - in /hadoop/core/branches/branch-0.18: CHANGES.txt bin/hadoop src/test/org/apache/hadoop/fs/TestHarFileSystem.java src/tools/org/apache/hadoop/tools/HadoopArchives.java
Date Thu, 12 Jun 2008 10:06:41 GMT
Author: ddas
Date: Thu Jun 12 03:06:40 2008
New Revision: 667022

URL: http://svn.apache.org/viewvc?rev=667022&view=rev
Log:
Merge -r 667019:667020 from trunk onto 0.18 branch. Fixes HADOOP-3542.

Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    hadoop/core/branches/branch-0.18/bin/hadoop
    hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/fs/TestHarFileSystem.java
    hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=667022&r1=667021&r2=667022&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Thu Jun 12 03:06:40 2008
@@ -571,6 +571,9 @@
     HADOOP-3418. When a directory is deleted, any leases that point to files
     in the subdirectory are removed. ((Tsz Wo (Nicholas), SZE via dhruba)
 
+    HADOOP-3542. Diables the creation of _logs directory for the archives
+    directory. (Mahadev Konar via ddas)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.18/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/bin/hadoop?rev=667022&r1=667021&r2=667022&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/bin/hadoop (original)
+++ hadoop/core/branches/branch-0.18/bin/hadoop Thu Jun 12 03:06:40 2008
@@ -70,6 +70,7 @@
   echo "  version              print the version"
   echo "  jar <jar>            run a jar file"
   echo "  distcp <srcurl> <desturl> copy file or directories recursively"
+  echo "  archive -archiveName NAME <src>* <dest> create a hadoop archive"
   echo "  daemonlog            get/set the log level for each daemon"
   echo " or"
   echo "  CLASSNAME            run the class named CLASSNAME"

Modified: hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/fs/TestHarFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/fs/TestHarFileSystem.java?rev=667022&r1=667021&r2=667022&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/fs/TestHarFileSystem.java
(original)
+++ hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/fs/TestHarFileSystem.java
Thu Jun 12 03:06:40 2008
@@ -139,6 +139,7 @@
     Path harPath = new Path("har://" + filePath.toUri().getPath());
     assertTrue(fs.exists(new Path(finalPath, "_index")));
     assertTrue(fs.exists(new Path(finalPath, "_masterindex")));
+    assertTrue(!fs.exists(new Path(finalPath, "_logs")));
     //creation tested
     //check if the archive is same
     // do ls and cat on all the files

Modified: hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java?rev=667022&r1=667021&r2=667022&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
(original)
+++ hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
Thu Jun 12 03:06:40 2008
@@ -377,6 +377,7 @@
     conf.setReducerClass(HArchivesReducer.class);
     conf.setMapOutputKeyClass(IntWritable.class);
     conf.setMapOutputValueClass(Text.class);
+    conf.set("hadoop.job.history.user.location", "none");
     FileInputFormat.addInputPath(conf, jobDirectory);
     //make sure no speculative execution is done
     conf.setSpeculativeExecution(false);



Mime
View raw message