(hadoop) 21/28: HDFS-17472. [FGL] gcDeletedSnapshot and getDelegationToken support FGL (#6743)

[zanderxu]

This is an automated email from the ASF dual-hosted git repository.

zanderxu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 0d626f516f435f9a36aaee8baa56ed5b5a422501
Author: ZanderXu <zande...@apache.org>
AuthorDate: Thu Apr 18 09:33:32 2024 +0800

    HDFS-17472. [FGL] gcDeletedSnapshot and getDelegationToken support FGL 
(#6743)
---
 .../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 d718d17ac8b..f89f0f122c1 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
@@ -6364,7 +6364,7 @@ Token<DelegationTokenIdentifier> getDelegationToken(Text 
renewer)
     String tokenId = null;
     Token<DelegationTokenIdentifier> token;
     checkOperation(OperationCategory.WRITE);
-    writeLock();
+    writeLock(FSNamesystemLockMode.FS);
     try {
       checkOperation(OperationCategory.WRITE);
       checkNameNodeSafeMode("Cannot issue delegation token");
@@ -6392,7 +6392,7 @@ Token<DelegationTokenIdentifier> getDelegationToken(Text 
renewer)
       getEditLog().logGetDelegationToken(dtId, expiryTime);
       tokenId = dtId.toStringStable();
     } finally {
-      writeUnlock(operationName, getLockReportInfoSupplier(tokenId));
+      writeUnlock(FSNamesystemLockMode.FS, operationName, 
getLockReportInfoSupplier(tokenId));
     }
     getEditLog().logSync();
     logAuditEvent(true, operationName, tokenId);
@@ -7532,7 +7532,7 @@ public void gcDeletedSnapshot(String snapshotRoot, String 
snapshotName)
     final INode.BlocksMapUpdateInfo blocksToBeDeleted;
 
     checkOperation(OperationCategory.WRITE);
-    writeLock();
+    writeLock(FSNamesystemLockMode.GLOBAL);
     try {
       checkOperation(OperationCategory.WRITE);
       rootPath = Snapshot.getSnapshotPath(snapshotRoot, snapshotName);
@@ -7544,7 +7544,7 @@ public void gcDeletedSnapshot(String snapshotRoot, String 
snapshotName)
       blocksToBeDeleted = FSDirSnapshotOp.deleteSnapshot(
           dir, snapshotManager, iip, snapshotName, now, snapshotRoot, false);
     } finally {
-      writeUnlock(operationName, getLockReportInfoSupplier(rootPath));
+      writeUnlock(FSNamesystemLockMode.GLOBAL, operationName, 
getLockReportInfoSupplier(rootPath));
     }
     blockManager.addBLocksToMarkedDeleteQueue(
         blocksToBeDeleted.getToDeleteList());


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org