Fix broken download of directories
(cherry picked from commit 745c9a0124
)
This commit is contained in:
parent
d76fc94b21
commit
569b7dae6c
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
/**
|
||||
* 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
|
||||
|
@ -28,6 +28,7 @@ import java.util.concurrent.ExecutionException;
|
|||
import java.util.concurrent.Future;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
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)
|
||||
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;
|
||||
// set public perms as 755 or 555 based on dir or file
|
||||
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
|
||||
else {
|
||||
// PRIVATE:
|
||||
// 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
|
||||
+ " to perm " + perm);
|
||||
|
@ -415,8 +421,7 @@ public class FSDownload implements Callable<Path> {
|
|||
}
|
||||
});
|
||||
}
|
||||
if (fStatus.isDirectory()
|
||||
&& !fStatus.isSymlink()) {
|
||||
if (isDir) {
|
||||
FileStatus[] statuses = fs.listStatus(path);
|
||||
for (FileStatus status : statuses) {
|
||||
changePermissions(fs, status.getPath());
|
||||
|
|
Loading…
Reference in New Issue