Fix #6958 #7596
Merged
Fix #6958 #7596
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
* Limit the number of query runners to remove when releasing one of them * Add while loop to release all items on the connected query runners list Closes #6958
AlexMesser
reviewed
May 8, 2021
| @@ -1051,7 +1051,10 @@ export class PostgresDriver implements Driver { | |||
| * Closes connection pool. | |||
| */ | |||
| protected async closePool(pool: any): Promise<void> { | |||
| await Promise.all(this.connectedQueryRunners.map(queryRunner => queryRunner.release())); | |||
| while (this.connectedQueryRunners.length) { | |||
There was a problem hiding this comment.
can you please explain why this change to while is needed? As I understand main motivation is to release them in sequence. If so, why its needed? Thanks!
There was a problem hiding this comment.
Because the .release() method of the query runners mutates the driver's connectedQueryRunners list, causing .map() to not iterate through all of them. I changed it to a while loop because it was the most obvious way i could think to ensure that all query runners got released and connectedQueryRunners was really empty before closing the pool 😅. If you have a better way to do it, let me know!
|
thank you for contribution! |
21 tasks
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.
Description of change
When releasing a used query runner on postgres' driver,
splice()was used without limiting the number of elements to be deleted, causing all the query runners to be removed, thus, preventing the driver from releasing them properly. So, the callback ontypeorm/src/driver/postgres/PostgresDriver.ts
Line 1056 in f85f436
I created a test based on the issue's demo, which works now.
Fixes #6958
Pull-Request Checklist
masterbranchnpm run lintpasses with this changenpm run testpasses with this changeFixes #0000