Fix cli server blocking on accept when using multiple workers #9693
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
devnexen
reviewed
Oct 9, 2022
devnexen
approved these changes
Oct 9, 2022
mvorisek
reviewed
Oct 9, 2022
| @@ -2441,6 +2441,14 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c | |||
| retval = FAILURE; | |||
| goto out; | |||
| } | |||
| // server_sock needs to be non-blocking when using multiple processes. Without it, the first process would | |||
There was a problem hiding this comment.
this should be asserted by a test
There was a problem hiding this comment.
Theoretically we could observe the processes with strace, but the bug depends on a race-condition:
- OS receives the request
- Process 1/2 each
a.select
b.accept
c. Handle other sockets
If 2.a. and 2.b. don't overlap the error is not triggered. A test would thus be unreliable. We barely have any tests for PHP_CLI_SERVER_WORKERS, some testing here is sensible for sure (I'll add that) but reliably testing this specific bug is probably difficult.
There was a problem hiding this comment.
I'm having trouble testing this on PHP-8.0, so I'll merge the test just into master. The good thing is that the test seems to catch the problem reported in this issue.
Edit: Sadly it does not.
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 GH-9400