You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by za...@apache.org on 2025/01/23 07:40:21 UTC
(hadoop) 01/28: HDFS-17394. [FGL] Remove unused WriteHoldCount of FSNamesystemLock (#6571)
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 8afbfbc2f572e7400c4666752986e0a48df4330e
Author: ZanderXu <za...@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 61a34828f14..bbebe78fb1f 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 boolean yield() {
// 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 6d69919bc0b..ce8da95b91c 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 @@ boolean hasReadLock() {
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 58c27efef27..6721cde2de0 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
@@ -1859,10 +1859,6 @@ public int getReadHoldCount() {
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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org