(hadoop) branch HDFS-17384 updated: HDFS-17394. [FGL] Remove unused WriteHoldCount of FSNamesystemLock (#6571)

[ferhui]

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

ferhui pushed a commit to branch HDFS-17384
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/HDFS-17384 by this push:
     new d58260a0988e HDFS-17394. [FGL] Remove unused WriteHoldCount of 
FSNamesystemLock (#6571)
d58260a0988e is described below

commit d58260a0988e111f370472103e0d56469d0347b5
Author: ZanderXu <zande...@apache.org>
AuthorDate: Tue Feb 27 14:12:02 2024 +0800

    HDFS-17394. [FGL] Remove unused WriteHoldCount of FSNamesystemLock (#6571)
---
 .../hdfs/server/namenode/ContentSummaryComputationContext.java |  3 +--
 .../org/apache/hadoop/hdfs/server/namenode/FSDirectory.java    | 10 ----------
 .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java   |  4 ----
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java
index 61a34828f14d..bbebe78fb1f6 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ContentSummaryComputationContext.java
@@ -123,8 +123,7 @@ public class ContentSummaryComputationContext {
 
     // sanity check.
     if (!hadDirReadLock || !hadFsnReadLock || hadDirWriteLock ||
-        hadFsnWriteLock || dir.getReadHoldCount() != 1 ||
-        fsn.getReadHoldCount() != 1) {
+        hadFsnWriteLock || fsn.getReadHoldCount() != 1) {
       // cannot relinquish
       return false;
     }
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
index 52ba4729a713..0305cbab3e37 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
@@ -284,16 +284,6 @@ public class FSDirectory implements Closeable {
     return namesystem.hasReadLock();
   }
 
-  @Deprecated // dirLock is obsolete, use namesystem.fsLock instead
-  public int getReadHoldCount() {
-    return namesystem.getReadHoldCount();
-  }
-
-  @Deprecated // dirLock is obsolete, use namesystem.fsLock instead
-  public int getWriteHoldCount() {
-    return namesystem.getWriteHoldCount();
-  }
-
   public int getListLimit() {
     return lsLimit;
   }
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 075398f000ec..8f0e535d953f 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
@@ -1849,10 +1849,6 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
     return this.fsLock.getReadHoldCount();
   }
 
-  public int getWriteHoldCount() {
-    return this.fsLock.getWriteHoldCount();
-  }
-
   /** Lock the checkpoint lock */
   public void cpLock() {
     this.cpLock.lock();


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