KAFKA-6710: Remove Thread.sleep from LogManager.deleteLogs #4771
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
junrao
approved these changes
Mar 24, 2018
There was a problem hiding this comment.
@rajinisivaram : Thanks for catching this. LGTM. Just a minor comment below.
| def hasDeletableLog: Boolean = { | ||
| if (!logsToBeDeleted.isEmpty) { | ||
| val (_, scheduleTimeMs) = logsToBeDeleted.peek() | ||
| scheduleTimeMs + currentDefaultConfig.fileDeleteDelayMs - time.milliseconds() <= 0 |
There was a problem hiding this comment.
Perhaps we can return the time to wait for the next task and in line 742, wait for that amount instead of always the default currentDefaultConfig.fileDeleteDelayMs. This will make the deletion time of the next item more accurate.
There was a problem hiding this comment.
@junrao Thanks for the review, I have updated the code.
|
@rajinisivaram Thanks for catching this. The change makes sense. |
|
@lindong28 Thanks for the review. |
tedyu
approved these changes
Mar 24, 2018
|
@junrao @lindong28 @tedyu Thank you for the review. Merging to trunk and 1.1. |
rajinisivaram
added a commit
that referenced
this pull request
Mar 24, 2018
`Thread.sleep` in `LogManager.deleteLogs` potentially blocks a scheduler thread for up to `log.segment.delete.delay.ms` with a default value of a minute. To avoid this, `deleteLogs` now deletes the logs for which `currentDefaultConfig.fileDeleteDelayMs` has elapsed after the delete was scheduled. Logs for which this interval has not yet elapsed are considered for deletion in the next iteration of `deleteLogs`, which is scheduled sooner if required. Reviewers: Jun Rao <junrao@gmail.com>, Dong Lin <lindong28@gmail.com>, Ted Yu <yuzhihong@gmail.com>
hejiefang
pushed a commit
to hejiefang/kafka
that referenced
this pull request
Mar 26, 2018
`Thread.sleep` in `LogManager.deleteLogs` potentially blocks a scheduler thread for up to `log.segment.delete.delay.ms` with a default value of a minute. To avoid this, `deleteLogs` now deletes the logs for which `currentDefaultConfig.fileDeleteDelayMs` has elapsed after the delete was scheduled. Logs for which this interval has not yet elapsed are considered for deletion in the next iteration of `deleteLogs`, which is scheduled sooner if required. Reviewers: Jun Rao <junrao@gmail.com>, Dong Lin <lindong28@gmail.com>, Ted Yu <yuzhihong@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thread.sleepinLogManager.deleteLogspotentially blocks a scheduler thread for up tolog.segment.delete.delay.mswith a default value of a minute. This PR skips delete when the first log is not yet ready to be deleted, freeing the scheduler thread. Logs are then deleted on the next delete iteration.Committer Checklist (excluded from commit message)