Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upDistribute connections to previously blocked threads when we're done #27108
+17
−25
Conversation
matthewd
added
the
activerecord
label
Nov 19, 2016
matthewd
self-assigned this
Nov 19, 2016
| # it to timeout with ConnectionTimeoutError | ||
| if (group_action_method == :disconnect || group_action_method == :disconnect!) && pool.num_waiting_in_queue > 0 | ||
| pool.with_connection {} # create a new connection in case there are threads still stuck in a queue | ||
| end |
This comment has been minimized.
This comment has been minimized.
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
Outdated
| @@ -699,6 +680,8 @@ def checkout_for_exclusive_access(checkout_timeout) | ||
| end | ||
| def with_new_connections_blocked | ||
| num_new_conns_required = 0 |
This comment has been minimized.
This comment has been minimized.
matthewd
force-pushed the
matthewd:allocate-connections-after-blocking
branch
to
d314646
Nov 24, 2016
matthewd
merged commit 3b13761
into
rails:master
Nov 24, 2016
added a commit
that referenced
this pull request
Nov 24, 2016
This comment has been minimized.
This comment has been minimized.
|
Backported as b79c7fe |
matthewd
deleted the
matthewd:allocate-connections-after-blocking
branch
Jun 11, 2017
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.
matthewd commentedNov 19, 2016
Two methods block new connections; we were already doing the right thing for
clear_reloadable_connections, but it's better placed inwith_new_connections_blocked, where it can work fordisconnecttoo.cc @thedarkone
Follow-up to #27057, to address a nearby-but-separate issue we spotted while looking at that.