This is an automated email from the ASF dual-hosted git repository.
inigoiri pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new ed70c11 HDFS-15172. Remove unnecessary deadNodeDetectInterval in
DeadNodeDetector#checkDeadNodes(). Contributed by Lisheng Sun.
ed70c11 is described below
commit ed70c115a8f5303766122ede97b4bb57f22754c8
Author: Inigo Goiri <[email protected]>
AuthorDate: Fri Feb 21 16:36:30 2020 -0800
HDFS-15172. Remove unnecessary deadNodeDetectInterval in
DeadNodeDetector#checkDeadNodes(). Contributed by Lisheng Sun.
---
.../org/apache/hadoop/hdfs/DeadNodeDetector.java | 25 ++++++----------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DeadNodeDetector.java
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DeadNodeDetector.java
index ce50547..75a91ba 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DeadNodeDetector.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DeadNodeDetector.java
@@ -24,7 +24,6 @@ import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
import org.apache.hadoop.hdfs.protocol.DatanodeLocalInfo;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.util.Daemon;
-import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -105,11 +104,6 @@ public class DeadNodeDetector implements Runnable {
new ConcurrentHashMap<String, DatanodeInfo>();
/**
- * The last time when detect dead node.
- */
- private long lastDetectDeadTS = 0;
-
- /**
* Interval time in milliseconds for probing dead node behavior.
*/
private long deadNodeDetectInterval = 0;
@@ -416,20 +410,15 @@ public class DeadNodeDetector implements Runnable {
* Check dead node periodically.
*/
private void checkDeadNodes() {
- long ts = Time.monotonicNow();
- if (ts - lastDetectDeadTS > deadNodeDetectInterval) {
- Set<DatanodeInfo> datanodeInfos = clearAndGetDetectedDeadNodes();
- for (DatanodeInfo datanodeInfo : datanodeInfos) {
- LOG.debug("Add dead node to check: {}.", datanodeInfo);
- if (!deadNodesProbeQueue.offer(datanodeInfo)) {
- LOG.debug("Skip to add dead node {} to check " +
- "since the probe queue is full.", datanodeInfo);
- break;
- }
+ Set<DatanodeInfo> datanodeInfos = clearAndGetDetectedDeadNodes();
+ for (DatanodeInfo datanodeInfo : datanodeInfos) {
+ LOG.debug("Add dead node to check: {}.", datanodeInfo);
+ if (!deadNodesProbeQueue.offer(datanodeInfo)) {
+ LOG.debug("Skip to add dead node {} to check " +
+ "since the probe queue is full.", datanodeInfo);
+ break;
}
- lastDetectDeadTS = ts;
}
-
state = State.IDLE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
