Skip to content

HIVE-26201 QueryResultsCache should add permission check after mkdir with special permission #3267

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 1 commit into from
Closed

HIVE-26201 QueryResultsCache should add permission check after mkdir with special permission #3267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 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 @@ -558,6 +558,11 @@ private Path getScratchDir(String scheme, String authority,
throw new RuntimeException("Cannot make directory: "
+ dirPath.toString());
}
if (!fs.getFileStatus(dirPath).getPermission().equals(fsPermission)) {
LOG.warn("Directory {} created with unexpected permissions : {}.Change permission to : ",
dirPath, fs.getFileStatus(dirPath).getPermission(), fsPermission);
fs.setPermission(dirPath, fsPermission);
}
if (isHDFSCleanup) {
fs.deleteOnExit(dirPath);
}
Expand Down
5 changes: 5 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,11 @@ private QueryResultsCache(HiveConf configuration) throws IOException {
FsPermission fsPermission = new FsPermission("700");
fs.mkdirs(cacheDirPath, fsPermission);

if (!fs.getFileStatus(cacheDirPath).getPermission().equals(fsPermission)) {
LOG.warn("Directory {} created with unexpected permissions : {}.Change permission to : ",
cacheDirPath, fs.getFileStatus(cacheDirPath).getPermission(), fsPermission);
fs.setPermission(cacheDirPath, fsPermission);
}
// Create non-existent path for 0-row results
zeroRowsPath = new Path(cacheDirPath, "dummy_zero_rows");

Expand Down
5 changes: 5 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,11 @@ 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(!fs.getFileStatus(tezDir).getPermission().equals(fsPermission)){
LOG.warn("Directory {} created with unexpected permissions : {}.Change permission to : ",
tezDir, fs.getFileStatus(tezDir).getPermission(), fsPermission);
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