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:22:27 UTC

hadoop git commit: HDFS-9911. TestDataNodeLifeline Fails intermittently. Contributed by Yiqun Lin (cherry picked from commit a95639068c99ebcaefe8b6c4268449d12a6577d6)

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 1a6b6e249 -> 4f135647f


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/4f135647
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4f135647
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4f135647

Branch: refs/heads/branch-2.8
Commit: 4f135647fd4033d96e38f761a844cc243edfe1a8
Parents: 1a6b6e2
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 21:09:03 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/4f135647/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 2e430af..06c25d8 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
@@ -1027,7 +1027,7 @@ class BPServiceActor implements Runnable {
     volatile long nextHeartbeatTime = monotonicNow();
 
     @VisibleForTesting
-    volatile long nextLifelineTime = monotonicNow();
+    volatile long nextLifelineTime;
 
     @VisibleForTesting
     volatile long lastBlockReportTime = monotonicNow();
@@ -1050,6 +1050,7 @@ class BPServiceActor implements Runnable {
       this.heartbeatIntervalMs = heartbeatIntervalMs;
       this.lifelineIntervalMs = lifelineIntervalMs;
       this.blockReportIntervalMs = blockReportIntervalMs;
+      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