Skip to content

Commit

Permalink
HBASE-26994 MasterFileSystem create directory without permission check (
Browse files Browse the repository at this point in the history
#4391)

Signed-off-by: Viraj Jasani <vjasani@apache.org>
  • Loading branch information
skysiders authored and virajjasani committed May 8, 2022
1 parent daaf5ad commit bba83dc
Showing 1 changed file with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -330,16 +330,15 @@ private void checkSubDir(final Path p, final String dirPermsConfName) throws IOE
throw new IOException("HBase directory '" + p + "' creation failure.");
}
}
} else {
if (isSecurityEnabled && !dirPerms.equals(fs.getFileStatus(p).getPermission())) {
// check whether the permission match
LOG.warn("Found HBase directory permissions NOT matching expected permissions for "
+ p.toString() + " permissions=" + fs.getFileStatus(p).getPermission() + ", expecting "
+ dirPerms + ". Automatically setting the permissions. "
+ "You can change the permissions by setting \"" + dirPermsConfName
+ "\" in hbase-site.xml " + "and restarting the master");
fs.setPermission(p, dirPerms);
}
}
if (isSecurityEnabled && !dirPerms.equals(fs.getFileStatus(p).getPermission())) {
// check whether the permission match
LOG.warn("Found HBase directory permissions NOT matching expected permissions for "
+ p.toString() + " permissions=" + fs.getFileStatus(p).getPermission() + ", expecting "
+ dirPerms + ". Automatically setting the permissions. "
+ "You can change the permissions by setting \"" + dirPermsConfName
+ "\" in hbase-site.xml " + "and restarting the master");
fs.setPermission(p, dirPerms);
}
}

Expand All @@ -354,9 +353,9 @@ private void checkStagingDir() throws IOException {
if (!this.fs.mkdirs(p, HiddenDirPerms)) {
throw new IOException("Failed to create staging directory " + p.toString());
}
} else {
this.fs.setPermission(p, HiddenDirPerms);
}
this.fs.setPermission(p, HiddenDirPerms);

} catch (IOException e) {
LOG.error("Failed to create or set permission on staging directory " + p.toString());
throw new IOException(
Expand Down

0 comments on commit bba83dc

Please sign in to comment.