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 cn...@apache.org on 2022/06/10 19:01:05 UTC
[hadoop] branch trunk updated: HDFS-16623. Avoid IllegalArgumentException in LifelineSender (#4409)
This is an automated email from the ASF dual-hosted git repository.
cnauroth 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 af5003a4731 HDFS-16623. Avoid IllegalArgumentException in LifelineSender (#4409)
af5003a4731 is described below
commit af5003a47311bad542964c42c1f776e4350446b9
Author: xuzq <15...@163.com>
AuthorDate: Sat Jun 11 03:00:56 2022 +0800
HDFS-16623. Avoid IllegalArgumentException in LifelineSender (#4409)
* HDFS-16623. Avoid IllegalArgumentException in LifelineSender
Co-authored-by: zengqiang.xu <ze...@shopee.com>
---
.../apache/hadoop/hdfs/server/datanode/BPServiceActor.java | 3 ++-
.../hdfs/server/datanode/TestBpServiceActorScheduler.java | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
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 838259d7f6a..d1b7024bc96 100755
--- 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
@@ -1345,7 +1345,8 @@ class BPServiceActor implements Runnable {
}
long getLifelineWaitTime() {
- return nextLifelineTime - monotonicNow();
+ long waitTime = nextLifelineTime - monotonicNow();
+ return waitTime > 0 ? waitTime : 0;
}
@VisibleForTesting
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBpServiceActorScheduler.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBpServiceActorScheduler.java
index f8406ed7a3f..166ae118f78 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBpServiceActorScheduler.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBpServiceActorScheduler.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hdfs.server.datanode;
+import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.hdfs.server.datanode.BPServiceActor.Scheduler;
@@ -204,6 +205,18 @@ public class TestBpServiceActorScheduler {
}
}
+ @Test
+ public void testScheduleLifelineScheduleTime() {
+ Scheduler mockScheduler = spy(new Scheduler(
+ HEARTBEAT_INTERVAL_MS, LIFELINE_INTERVAL_MS,
+ BLOCK_REPORT_INTERVAL_MS, OUTLIER_REPORT_INTERVAL_MS));
+ long now = Time.monotonicNow();
+ mockScheduler.scheduleNextLifeline(now);
+ long mockMonotonicNow = now + LIFELINE_INTERVAL_MS * 2;
+ doReturn(mockMonotonicNow).when(mockScheduler).monotonicNow();
+ assertTrue(mockScheduler.getLifelineWaitTime() >= 0);
+ }
+
@Test
public void testOutlierReportScheduling() {
for (final long now : getTimestamps()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org