Use connection pause/resume to prevent kill race condition #7
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
martinmacko47
commented
Apr 22, 2021
| @@ -1051,6 +1051,68 @@ module.exports = function (knex) { | |||
| }); | |||
| }); | |||
|
|
|||
| it('.timeout(ms, {cancel: true}) should not cancel subsequent queries in a transaction if timeouted query completes while being cancelled', async function () { | |||
There was a problem hiding this comment.
This test will fail without connectionToKill.pause()/resume() in Client_MySQL.cancelQuery() method. The test simulates a race-condition when the timeouted query manages to complete while we are trying to kill it. It is simulated by slowing down Client_MySQL.acquireRawConnection() method.
The current behaviour without connectionToKill.pause()/resume():
Fixed behaviour without the race condition with connectionToKill.pause()/resume():
Btw, note that query B has no timeout, to make sure it won't timeout while waiting in the queue.
maximelkin
reviewed
Apr 24, 2021
lib/dialects/mysql/index.js
Outdated
| @@ -179,6 +180,7 @@ class Client_MySQL extends Client { | |||
| if (conn.__knex__disposed) { | |||
| this.logger.warn(`Connection Error: ${conn.__knex__disposed}`); | |||
| } | |||
| connectionToKill.resume(); | |||
There was a problem hiding this comment.
minor tweak: this could be run before connection destroy, so working connection will continue to work earlier
maximelkin
approved these changes
Apr 27, 2021
…se-all-timeout-error+dequeue-in-driver+pause-resume Conflicts: test/integration/query/additional.js
martinmacko47
deleted the
promise-all-timeout-error+dequeue-in-driver+pause-resume
branch
martinmacko47
added a commit
that referenced
this pull request
Apr 28, 2021
* Use connection pause/resume to prevent kill race condition * Move connection resume before destroy raw connection Conflicts: lib/dialects/mysql/index.js
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.
No description provided.