This repository was archived by the owner on Jun 2, 2021. It is now read-only.
Added check for negative nanosTimeout after connection acquisition. I… #4
Conversation
This file contains hidden or 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
…n a case where a connection takes a long time to establish, this prevents a call to mysql sleep() with a negative number, which will yield: java.sql.SQLException: Incorrect arguments to sleep.
| @@ -89,6 +89,10 @@ protected boolean awaitNanosInternal(long nanosTimeout) throws InterruptedExcept | |||
|
|
|||
| // Adjust nanosTimeout (due to time it took to get a connection) | |||
| nanosTimeout -= (System.nanoTime() - now); | |||
| if (nanosTimeout <= 0) { | |||
| LOG.trace("After connection acquired, timeout was negative or zero: {}", nanosTimeout); | |||
There was a problem hiding this comment.
I don't think we need the LOG.trace
|
This was a good catch, but on closer inspection I wonder if there is still an issue. If Math.round(nanosTimeout / 1000000.0) rounds to zero, then we will sleep for 0 milliseconds. Perhaps do the check if <= 0 after the rounding? |
|
Yep. Done. |
| LOG.trace("After connection acquired, timeout was negative or zero: {}", nanosTimeout); | ||
| float timeout = Math.round(nanosTimeout / 1000000.0) / 1000f; | ||
| if (timeout <= 0) { | ||
| LOG.trace("After connection acquired, timeout was negative or zero: {}", timeout); |
|
Thanks for the changes. Sorry two additional minor comments. |
|
Hey xgp, sorry but your changes is now nearly all formatting changes, which makes it hard to know what you changed. Would you undo the formatting changes so we can review just your changes. Afterwards we can define a format and apply it to the project. I've had some success with "formatter-maven-plugin" to ensure a style is stuck to. |
|
Sure. I'll do that in the next few days. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Added check for negative nanosTimeout after connection acquisition. In a case where a connection takes a long time to establish, this prevents a call to mysql sleep() with a negative number, which will yield: java.sql.SQLException: Incorrect arguments to sleep.
See: #3