big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-16426. Fix nextBlockReportTime when trigger full block report force (#3887)

Browse Source
This commit is contained in:
qinyuren 2022-01-19 12:42:33 +08:00 committed by GitHub
parent d8ab84275e
commit fcb1076699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
View File

@ -1271,6 +1271,7 @@ boolean isOutliersReportDue(long curTime) {
void forceFullBlockReportNow() { void forceFullBlockReportNow() {
forceFullBlockReport.set(true); forceFullBlockReport.set(true);
resetBlockReportTime = true;
} }
/** /**

17
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBpServiceActorScheduler.java
View File

@ -141,6 +141,23 @@ public void testScheduleNextBlockReport3() {
} }
} }
/**
* force trigger full block report multi times, the next block report
* must be scheduled in the range (now + BLOCK_REPORT_INTERVAL_SEC).
*/
@Test
public void testScheduleNextBlockReport4() {
for (final long now : getTimestamps()) {
Scheduler scheduler = makeMockScheduler(now);
for (int i = 0; i < getTimestamps().size(); ++i) {
scheduler.forceFullBlockReportNow();
scheduler.scheduleNextBlockReport();
}
assertTrue(scheduler.getNextBlockReportTime() - now >= 0);
assertTrue(scheduler.getNextBlockReportTime() - now <= BLOCK_REPORT_INTERVAL_MS);
}
}
@Test @Test
public void testScheduleHeartbeat() { public void testScheduleHeartbeat() {
for (final long now : getTimestamps()) { for (final long now : getTimestamps()) {