This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new edf985e26946 HDFS-17500: Add missing operation name while authorizing
some operations (#6776). Contributed by kulkabhay.
edf985e26946 is described below
commit edf985e26946cdffbec0a2e1ed468c7a87add006
Author: kulkabhay <kulkab...@users.noreply.github.com>
AuthorDate: Sun May 5 21:44:30 2024 -0700
HDFS-17500: Add missing operation name while authorizing some operations
(#6776). Contributed by kulkabhay.
Signed-off-by: He Xiaoqiao <hexiaoq...@apache.org>
---
.../hadoop/hdfs/server/namenode/FSNamesystem.java | 24 ++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index e21c24398680..2f399cd4c234 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -2618,9 +2618,10 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
* @throws IOException
*/
BlockStoragePolicy getStoragePolicy(String src) throws IOException {
+ final String operationName = "getStoragePolicy";
checkOperation(OperationCategory.READ);
final FSPermissionChecker pc = getPermissionChecker();
- FSPermissionChecker.setOperationType(null);
+ FSPermissionChecker.setOperationType(operationName);
readLock();
try {
checkOperation(OperationCategory.READ);
@@ -2646,9 +2647,10 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
}
long getPreferredBlockSize(String src) throws IOException {
+ final String operationName = "getPreferredBlockSize";
checkOperation(OperationCategory.READ);
final FSPermissionChecker pc = getPermissionChecker();
- FSPermissionChecker.setOperationType(null);
+ FSPermissionChecker.setOperationType(operationName);
readLock();
try {
checkOperation(OperationCategory.READ);
@@ -2709,6 +2711,8 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
String storagePolicy, boolean logRetryCache) throws IOException {
HdfsFileStatus status;
+ final String operationName = "create";
+ FSPermissionChecker.setOperationType(operationName);
try {
status = startFileInt(src, permissions, holder, clientMachine, flag,
createParent, replication, blockSize, supportedVersions,
ecPolicyName,
@@ -2764,7 +2768,6 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
checkOperation(OperationCategory.WRITE);
final FSPermissionChecker pc = getPermissionChecker();
- FSPermissionChecker.setOperationType(null);
writeLock();
try {
checkOperation(OperationCategory.WRITE);
@@ -2857,9 +2860,10 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
boolean recoverLease(String src, String holder, String clientMachine)
throws IOException {
boolean skipSync = false;
+ final String operationName = "recoverLease";
checkOperation(OperationCategory.WRITE);
final FSPermissionChecker pc = getPermissionChecker();
- FSPermissionChecker.setOperationType(null);
+ FSPermissionChecker.setOperationType(operationName);
writeLock();
try {
checkOperation(OperationCategory.WRITE);
@@ -3105,9 +3109,10 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
final byte storagePolicyID;
final List<DatanodeStorageInfo> chosen;
final BlockType blockType;
+ final String operationName = "getAdditionalDatanode";
checkOperation(OperationCategory.WRITE);
final FSPermissionChecker pc = getPermissionChecker();
- FSPermissionChecker.setOperationType(null);
+ FSPermissionChecker.setOperationType(operationName);
readLock();
try {
// Changing this operation category to WRITE instead of making
getAdditionalDatanode as a
@@ -3155,10 +3160,11 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
*/
void abandonBlock(ExtendedBlock b, long fileId, String src, String holder)
throws IOException {
+ final String operationName = "abandonBlock";
NameNode.stateChangeLog.debug("BLOCK* NameSystem.abandonBlock: {} of file
{}", b, src);
checkOperation(OperationCategory.WRITE);
final FSPermissionChecker pc = getPermissionChecker();
- FSPermissionChecker.setOperationType(null);
+ FSPermissionChecker.setOperationType(operationName);
writeLock();
try {
checkOperation(OperationCategory.WRITE);
@@ -3222,9 +3228,10 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
ExtendedBlock last, long fileId)
throws IOException {
boolean success = false;
+ final String operationName = "completeFile";
checkOperation(OperationCategory.WRITE);
final FSPermissionChecker pc = getPermissionChecker();
- FSPermissionChecker.setOperationType(null);
+ FSPermissionChecker.setOperationType(operationName);
writeLock();
try {
checkOperation(OperationCategory.WRITE);
@@ -3666,10 +3673,11 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
*/
void fsync(String src, long fileId, String clientName, long lastBlockLength)
throws IOException {
+ final String operationName = "fsync";
NameNode.stateChangeLog.info("BLOCK* fsync: " + src + " for " +
clientName);
checkOperation(OperationCategory.WRITE);
final FSPermissionChecker pc = getPermissionChecker();
- FSPermissionChecker.setOperationType(null);
+ FSPermissionChecker.setOperationType(operationName);
writeLock();
try {
checkOperation(OperationCategory.WRITE);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
