Restart FPM completely in case of timeouts #1144
Merged
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
Follow-up of #1133 This is because sending SIGUSR2 to FPM (the previously implemented solution) did not really stop with 100% certainty the PHP script that timed out. Indeed, it merely interrupted the currently blocked call (e.g. a sleep, a DB call, etc.), flushed the logs and carried on. My guess is that this could have caused the PHP script to continue to run in some cases, possibly running into yet another timeout on a next line (e.g. another DB call). This PR fixes the timeout test that wasn't really working (🤦 ) and restarts FPM completely in case of timeout. That is confirmed to completely stop the execution of the timed out script + flush the logs to stderr.
mnapoli
reviewed
Jan 27, 2022
| @@ -18,6 +18,3 @@ catch_workers_output = yes | |||
| ; Limit the number of core dump logs to 1 to avoid filling up the /tmp disk | |||
| ; See https://github.com/brefphp/bref/issues/275 | |||
| rlimit_core = 1 | |||
|
|
|||
| ; Very short timeout to be able to test timeouts without having a very long test suite | |||
| request_terminate_timeout = 1 | |||
There was a problem hiding this comment.
This was a leftover from 2019 that "faked" the results of the timeout test
|
This is what CloudWatch logs look like now when you have 1 good request followed by 1 timed-out request:
|
shadowhand
approved these changes
Jan 27, 2022
Excellent! And good sleuthing to find that it attempts to resume after interrupt!
|
|
t-richard
approved these changes
Jan 27, 2022
|
@mnapoli can we get a release with this? We're currently trying to upgrade to serverless v3 but stuck because this hasn't been released. |
|
@shadowhand you will have to wait until I do, maybe today. |
|
@mnapoli thank you! |
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.
Follow-up of #1133
This is because sending SIGUSR2 to FPM (the previously implemented solution) did not really stop with 100% certainty the PHP script that timed out.
Indeed, it merely interrupted the currently blocked call (e.g. a sleep, a DB call, etc.), flushed the logs and carried on. My guess is that this could have caused the PHP script to continue to run in some cases, possibly running into yet another timeout on a next line (e.g. another DB call).
This PR fixes the timeout test that wasn't really working (🤦 ) and restarts FPM completely in case of timeout. That is confirmed to completely stop the execution of the timed out script + flush the logs to stderr.