Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tasanuma merged 1 commit into from
Jan 19, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ject/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,6 +1271,7 @@ boolean isOutliersReportDue(long curTime) {

void forceFullBlockReportNow() {
forceFullBlockReport.set(true);
resetBlockReportTime = true;
}

/**
Expand Down
17 changes: 17 additions & 0 deletions ...dfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBpServiceActorScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
public void testScheduleHeartbeat() {
for (final long now : getTimestamps()) {
Expand Down