Skip to content

HIVE-26887 Make sure dirPath has the correct permissions #3894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skysiders wants to merge 2 commits into from
Closed

HIVE-26887 Make sure dirPath has the correct permissions #3894

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cdd913
add permission check after mkdir
skysiders Dec 24, 2022
0ba7f6a
fix code style
skysiders Jan 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ql/src/java/org/apache/hadoop/hive/ql/Context.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,9 @@ private Path getScratchDir(String scheme, String authority,
throw new RuntimeException("Cannot make directory: "
+ dirPath.toString());
}
if (!fsPermission.equals(fsPermission.applyUMask(FsPermission.getUMask(conf)))) {
fs.setPermission(dirPath, fsPermission);
}
if (isHDFSCleanup) {
fs.deleteOnExit(dirPath);
}
Expand Down
3 changes: 3 additions & 0 deletions ql/src/java/org/apache/hadoop/hive/ql/cache/results/QueryResultsCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,9 @@ private QueryResultsCache(HiveConf configuration) throws IOException {
FsPermission fsPermission = new FsPermission("700");
fs.mkdirs(cacheDirPath, fsPermission);

if (!fsPermission.equals(fsPermission.applyUMask(FsPermission.getUMask(conf)))) {
fs.setPermission(cacheDirPath, fsPermission);
Copy link
Contributor

@cnauroth cnauroth Jan 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation is off on this line.

}
// Create non-existent path for 0-row results
zeroRowsPath = new Path(cacheDirPath, "dummy_zero_rows");

Expand Down
3 changes: 3 additions & 0 deletions ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,9 @@ private Path createTezDir(String sessionId, String suffix) throws IOException {
FileSystem fs = tezDir.getFileSystem(conf);
FsPermission fsPermission = new FsPermission(HiveConf.getVar(conf, HiveConf.ConfVars.SCRATCHDIRPERMISSION));
fs.mkdirs(tezDir, fsPermission);
if (!fsPermission.equals(fsPermission.applyUMask(FsPermission.getUMask(conf)))) {
fs.setPermission(tezDir, fsPermission);
}
// Make sure the path is normalized (we expect validation to pass since we just created it).
tezDir = DagUtils.validateTargetDir(tezDir, conf).getPath();

Expand Down
3 changes: 3 additions & 0 deletions ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,9 @@ static void createPath(HiveConf conf, Path path, String permission, boolean isLo
if (!fs.mkdirs(path, fsPermission)) {
throw new IOException("Failed to create directory " + path + " on fs " + fs.getUri());
}
if (!fsPermission.equals(fsPermission.applyUMask(FsPermission.getUMask(conf)))) {
fs.setPermission(path, fsPermission);
}
String dirType = isLocal ? "local" : "HDFS";
LOG.info("Created " + dirType + " directory: " + path.toString());
}
Expand Down