commit 26b2b48dd7f6e72ec6ba58de0c9db2573a9d795b

Author: Devaraj Das <ddas@yahoo-inc.com>
Date:   Thu Oct 21 11:48:47 2010 -0700

    . Restores the behavior of recursive chmod for Distributed Cache archives.
    
    +++ b/YAHOO-CHANGES.txt
    +Release 0.20.201.4 - unreleased
    +
    +     Restores the behavior of recursive chmod for Distributed
    +    Cache archives. (ddas)
    +


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

src/core/org/apache/hadoop/fs/FileUtil.java

@@ -721,7 +721,7 @@ public class FileUtil {
    * @throws InterruptedException
    */
   public static int chmod(String filename, String perm, boolean recursive)
-                            throws IOException, InterruptedException {
+                            throws IOException {
     StringBuffer cmdBuf = new StringBuffer();
     cmdBuf.append("chmod ");
     if (recursive) {

src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java

@@ -502,6 +502,7 @@ public class TrackerDistributedCacheManager {
         // else will not do anyhting
         // and copy the file into the dir as it is
       }
+      FileUtil.chmod(destDir.toString(), "ugo+rx", true);
     }
     // promote the output to the final location
     if (!localFs.rename(workDir, finalDir)) {

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

@@ -96,11 +96,13 @@ public class TestCommandLineJobSubmission extends TestCase {
       libjars[1] = fs.getUri().resolve(cachePath + "/test.jar").toString();
       
       // construct options for -archives
-      String[] archives = new String[3];
+      String[] archives = new String[4];
       archives[0] = tgzPath.toString();
       archives[1] = tarPath + "#tarlink";
       archives[2] = 
         fs.getUri().resolve(cachePath + "/test.zip#ziplink").toString();
+      archives[3] = 
+        fs.getUri().resolve(cachePath + "/test.jar#jarlink").toString();
       
       String[] args = new String[8];
       args[0] = "-files";

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

@@ -579,13 +579,9 @@ public class TestTaskTrackerLocalization extends TestCase {
     out.writeBytes("dummy input");
     out.close();
     // no write permission for subDir and subDir/file
-    try {
-      int ret = 0;
-      if((ret = FileUtil.chmod(subDir.toUri().getPath(), "a=rx", true)) != 0) {
-        LOG.warn("chmod failed for " + subDir + ";retVal=" + ret);
-      }
-    } catch(InterruptedException e) {
-      LOG.warn("Interrupted while doing chmod for " + subDir);
+    int ret = 0;
+    if((ret = FileUtil.chmod(subDir.toUri().getPath(), "a=rx", true)) != 0) {
+      LOG.warn("chmod failed for " + subDir + ";retVal=" + ret);
     }
   }
 

src/test/testshell/ExternalMapReduce.java

@@ -18,6 +18,7 @@
 
 package testshell;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
 
@@ -73,7 +74,7 @@ public class ExternalMapReduce extends Configured implements Tool {
       //fork off ls to see if the file exists.
       // java file.exists() will not work on 
       // cygwin since it is a symlink
-      String[] argv = new String[7];
+      String[] argv = new String[8];
       argv[0] = "ls";
       argv[1] = "files_tmp";
       argv[2] = "localfilelink";
@@ -81,6 +82,7 @@ public class ExternalMapReduce extends Configured implements Tool {
       argv[4] = "tarlink";
       argv[5] = "ziplink";
       argv[6] = "test.tgz";
+      argv[7] = "jarlink";
       Process p = Runtime.getRuntime().exec(argv);
       int ret = -1;
       try {
@@ -91,6 +93,10 @@ public class ExternalMapReduce extends Configured implements Tool {
       if (ret != 0) {
         throw new IOException("files_tmp does not exist");
       }
+      File file = new File("./jarlink/test.txt");
+      if (!file.canExecute()) {
+        throw new IOException("jarlink/test.txt is not executable");
+      }
     }
   }