Skip to content

HDFS-11045. Make TestDirectoryScanner#testThrottling() not based on timing #3448

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

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
+204 −194
Open

HDFS-11045. Make TestDirectoryScanner#testThrottling() not based on timing #3448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b74df0
HDFS-11045. Make TestDirectoryScanner#testThrottling() not based on t…
HanleyYang Sep 16, 2021
9c5c5bc
Fix typo.
HanleyYang Sep 16, 2021
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
24 changes: 14 additions & 10 deletions ...ct/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,22 +733,26 @@ public void throttle() throws InterruptedException {
if (throttleLimitMsPerSec > 0L) {
final long runningTime = throttleTimer.now(TimeUnit.MILLISECONDS);
if (runningTime >= throttleLimitMsPerSec) {
final long sleepTime;
if (runningTime >= 1000L) {
LOG.warn("Unable to throttle within the second. Blocking for 1s.");
sleepTime = 1000L;
} else {
// Sleep for the expected time plus any time processing ran over
final long overTime = runningTime - throttleLimitMsPerSec;
sleepTime = (1000L - throttleLimitMsPerSec) + overTime;
}
Thread.sleep(sleepTime);
Thread.sleep(calculateSleepTime(runningTime));
throttleTimer.reset().start();
}
accumulateTimeWaiting();
}
}

@VisibleForTesting
long calculateSleepTime(long runningTime) {
if (throttleLimitMsPerSec <= 0) return 0;
if (runningTime >= 1000L) {
LOG.warn("Unable to throttle within the second. Blocking for 1s.");
return 1000L;
} else {
// Sleep for the expected time plus any time processing ran over
final long overTime = runningTime - throttleLimitMsPerSec;
return (1000L - throttleLimitMsPerSec) + overTime;
}
}

/**
* Helper method to measure time running.
*/
Expand Down
Loading