actionpack: Use an infinite sized queue in testing ActionController::Live #41609
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
dylanahsmith
force-pushed
the
fix-live-stream-test
branch
from
a8e3f68
to
a5a29e4
Compare
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. |
zzak
approved these changes
Jun 2, 2021
|
@dylanahsmith This LGTM, can you rebase the |
dylanahsmith
force-pushed
the
fix-live-stream-test
branch
from
a5a29e4
to
93e0421
Compare
…Live To avoid a deadlock from the buffer filling up during testing due to the ActionController::Live test monkey patch that processes the request in the same thread, which means there is no consumer of the queue until the request is processed.
dylanahsmith
force-pushed
the
fix-live-stream-test
branch
from
93e0421
to
f6fb700
Compare
|
I've rebased the PR and handled the changelog conflict. |
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.
Fixes #31813
Problem Summary
ActionController::Live normally processes the request in another thread, however, a monkey patch in [ActionController::Live monkey patch in action_controller/test_case.rb] forces it to instead get processed in the same thread. Since the writes go to a
SizedQueue.new(10)in ActionController::Live::Buffer, a test will deadlock if the controller makes more than 10 writes.Solution
The fix is similar to #31938, we use an infinitely sized
Queue.newfor testing. This PR just does this more cleanly by using an attribute on the class to configure the queue size, which allows both the test and normal behaviour to be tested cleanly.