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 ep...@apache.org on 2017/01/27 21:04:34 UTC
hadoop git commit: HDFS-9911. TestDataNodeLifeline Fails
intermittently. Contributed by Yiqun Lin
Repository: hadoop
Updated Branches:
refs/heads/branch-2 4703f5d20 -> d20dc8691
HDFS-9911. TestDataNodeLifeline Fails intermittently. Contributed by Yiqun Lin
(cherry picked from commit a95639068c99ebcaefe8b6c4268449d12a6577d6)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d20dc869
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d20dc869
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d20dc869
Branch: refs/heads/branch-2
Commit: d20dc8691e984fc4b3966a478b64f027ea7f8a05
Parents: 4703f5d
Author: Anu Engineer <ae...@apache.org>
Authored: Fri Dec 16 09:46:21 2016 -0800
Committer: Eric Payne <ep...@apache.org>
Committed: Fri Jan 27 20:55:59 2017 +0000
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d20dc869/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
index 5bfdaec..c605588 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
@@ -1083,7 +1083,7 @@ class BPServiceActor implements Runnable {
volatile long nextHeartbeatTime = monotonicNow();
@VisibleForTesting
- volatile long nextLifelineTime = monotonicNow();
+ volatile long nextLifelineTime;
@VisibleForTesting
volatile long lastBlockReportTime = monotonicNow();
@@ -1111,6 +1111,7 @@ class BPServiceActor implements Runnable {
this.lifelineIntervalMs = lifelineIntervalMs;
this.blockReportIntervalMs = blockReportIntervalMs;
this.slowPeersReportIntervalMs = slowPeersReportIntervalMs;
+ scheduleNextLifeline(nextHeartbeatTime);
}
// This is useful to make sure NN gets Heartbeat before Blockreport
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org