Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken download of directories 

(cherry picked from commit 745c9a0124)
This commit is contained in:
Karthik Kambatla 2014-11-05 10:12:56 -08:00 committed by Arun C. Murthy
parent e76faebc95
commit b31b4bf029
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java
View File

@ -1,4 +1,4 @@
/** /**
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information * distributed with this work for additional information
@ -28,6 +28,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate; import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
@ -389,17 +390,22 @@ public class FSDownload implements Callable<Path> {
*/ */
private void changePermissions(FileSystem fs, final Path path) private void changePermissions(FileSystem fs, final Path path)
throws IOException, InterruptedException { throws IOException, InterruptedException {
FileStatus fStatus = fs.getFileStatus(path); File f = new File(path.toUri());
if (FileUtils.isSymlink(f)) {
// avoid following symlinks when changing permissions
return;
}
boolean isDir = f.isDirectory();
FsPermission perm = cachePerms; FsPermission perm = cachePerms;
// set public perms as 755 or 555 based on dir or file // set public perms as 755 or 555 based on dir or file
if (resource.getVisibility() == LocalResourceVisibility.PUBLIC) { if (resource.getVisibility() == LocalResourceVisibility.PUBLIC) {
perm = fStatus.isDirectory() ? PUBLIC_DIR_PERMS : PUBLIC_FILE_PERMS; perm = isDir ? PUBLIC_DIR_PERMS : PUBLIC_FILE_PERMS;
} }
// set private perms as 700 or 500 // set private perms as 700 or 500
else { else {
// PRIVATE: // PRIVATE:
// APPLICATION: // APPLICATION:
perm = fStatus.isDirectory() ? PRIVATE_DIR_PERMS : PRIVATE_FILE_PERMS; perm = isDir ? PRIVATE_DIR_PERMS : PRIVATE_FILE_PERMS;
} }
LOG.debug("Changing permissions for path " + path LOG.debug("Changing permissions for path " + path
+ " to perm " + perm); + " to perm " + perm);
@ -415,8 +421,7 @@ public class FSDownload implements Callable<Path> {
} }
}); });
} }
if (fStatus.isDirectory() if (isDir) {
&& !fStatus.isSymlink()) {
FileStatus[] statuses = fs.listStatus(path); FileStatus[] statuses = fs.listStatus(path);
for (FileStatus status : statuses) { for (FileStatus status : statuses) {
changePermissions(fs, status.getPath()); changePermissions(fs, status.getPath());