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 sh...@apache.org on 2021/03/06 22:26:40 UTC
[hadoop] branch branch-3.3 updated: HDFS-15808. Add metrics for
FSNamesystem read/write lock hold long time. (#2668) Contributed by
tomscut.
This is an automated email from the ASF dual-hosted git repository.
shv pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new c498ef4 HDFS-15808. Add metrics for FSNamesystem read/write lock hold long time. (#2668) Contributed by tomscut.
c498ef4 is described below
commit c498ef4b6dc7960f1f4699cafea598b3d71ca885
Author: tomscut <li...@bigo.sg>
AuthorDate: Mon Mar 1 16:35:12 2021 -0800
HDFS-15808. Add metrics for FSNamesystem read/write lock hold long time. (#2668) Contributed by tomscut.
(cherry picked from commit 9cb51bf106802c78b1400fba9f1d1c7e772dd5e7)
---
.../hadoop/hdfs/server/namenode/FSNamesystem.java | 14 +++++++++
.../hdfs/server/namenode/FSNamesystemLock.java | 34 ++++++++++++++++++++++
2 files changed, 48 insertions(+)
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 6a6405b..fae094a 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
@@ -4758,6 +4758,20 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
return fsLock.getQueueLength();
}
+ @Metric(value = {"ReadLockLongHoldCount", "The number of time " +
+ "the read lock has been held for longer than the threshold"},
+ type = Metric.Type.COUNTER)
+ public long getNumOfReadLockLongHold() {
+ return fsLock.getNumOfReadLockLongHold();
+ }
+
+ @Metric(value = {"WriteLockLongHoldCount", "The number of time " +
+ "the write lock has been held for longer than the threshold"},
+ type = Metric.Type.COUNTER)
+ public long getNumOfWriteLockLongHold() {
+ return fsLock.getNumOfWriteLockLongHold();
+ }
+
int getNumberOfDatanodes(DatanodeReportType type) {
readLock();
try {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
index 811cd23..6502c4c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
@@ -108,6 +108,16 @@ class FSNamesystemLock {
private final AtomicReference<LockHeldInfo> longestReadLockHeldInfo =
new AtomicReference<>(new LockHeldInfo(0, 0, null));
private LockHeldInfo longestWriteLockHeldInfo = new LockHeldInfo(0, 0, null);
+ /**
+ * The number of time the read lock
+ * has been held longer than the threshold.
+ */
+ private final AtomicLong numReadLockLongHold = new AtomicLong(0);
+ /**
+ * The number of time the write lock
+ * has been held for longer than the threshold.
+ */
+ private final AtomicLong numWriteLockLongHold = new AtomicLong(0);
@VisibleForTesting
static final String OP_NAME_OTHER = "OTHER";
@@ -176,6 +186,7 @@ class FSNamesystemLock {
final long readLockIntervalMs =
TimeUnit.NANOSECONDS.toMillis(readLockIntervalNanos);
if (needReport && readLockIntervalMs >= this.readLockReportingThresholdMs) {
+ numReadLockLongHold.incrementAndGet();
LockHeldInfo localLockHeldInfo;
do {
localLockHeldInfo = longestReadLockHeldInfo.get();
@@ -253,6 +264,7 @@ class FSNamesystemLock {
LogAction logAction = LogThrottlingHelper.DO_NOT_LOG;
if (needReport &&
writeLockIntervalMs >= this.writeLockReportingThresholdMs) {
+ numWriteLockLongHold.incrementAndGet();
if (longestWriteLockHeldInfo.getIntervalMs() < writeLockIntervalMs) {
longestWriteLockHeldInfo =
new LockHeldInfo(currentTimeMs, writeLockIntervalMs,
@@ -303,6 +315,28 @@ class FSNamesystemLock {
}
/**
+ * Returns the number of time the read lock
+ * has been held longer than the threshold.
+ *
+ * @return long - Number of time the read lock
+ * has been held longer than the threshold
+ */
+ public long getNumOfReadLockLongHold() {
+ return numReadLockLongHold.get();
+ }
+
+ /**
+ * Returns the number of time the write lock
+ * has been held longer than the threshold.
+ *
+ * @return long - Number of time the write lock
+ * has been held longer than the threshold.
+ */
+ public long getNumOfWriteLockLongHold() {
+ return numWriteLockLongHold.get();
+ }
+
+ /**
* Returns the QueueLength of waiting threads.
*
* A larger number indicates greater lock contention.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org