This is an automated email from the ASF dual-hosted git repository. zanderxu pushed a commit to branch HDFS-17384 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit c4ba19c23b4f97787331ddbe09e07e6d5e16d459 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 516e87d11f5a..96fa1b4ad4d0 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 @@ -285,16 +285,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 e21c24398680..8470eac05f83 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 @@ -1853,10 +1853,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