summaryrefslogtreecommitdiff
path: root/sapi/fpm/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add extra run test for pm.max_spawn_rateJakub Zelenka2021-03-282-0/+44
|
* Max spawn child processes rate an oncePaulius Sapragonas2021-03-282-0/+81
| | | | * Add functionality to expect log config options
* Revert "Do not check exact values of unstable metrices in FPM status test"Nikita Popov2021-03-242-0/+8
| | | | | | | This reverts commit 5b01c4863fe9e4bc2702b2bbf66d292d23001a18. The previous commit fixes the 32-bit issue. Maybe this one is also needed, but let's see if any failures of this form turn up first.
* Do not check exact values of unstable metrices in FPM status testJakub Zelenka2021-03-232-8/+0
|
* Merge branch 'PHP-8.0'Jakub Zelenka2021-03-214-26/+193
|\
| * Merge branch 'PHP-7.4' into PHP-8.0Jakub Zelenka2021-03-214-26/+193
| |\
| | * Fix bug #80024: Duplication of info about inherited socket after pool removingJakub Zelenka2021-03-214-26/+193
| | |
* | | Add support for openmetrics formatting to FPM statusCees-Jan Kiewiet2021-03-212-5/+63
|/ /
* | Merge branch 'PHP-7.4' into PHP-8.0Jakub Zelenka2020-12-133-0/+77
|\ \ | |/
| * Fix bug #69625: FPM returns 200 status on request without SCRIPT_FILENAMEJakub Zelenka2020-12-133-0/+77
| |
* | FPM: Prevent warning with raising pm.max_children for shared poolJakub Zelenka2020-08-041-2/+0
| |
* | XFAIL status-listen FPM testNikita Popov2020-08-041-0/+2
| | | | | | | | | | | | | | | | | | | | Has frequent intermittent failures with: ERROR: The NOTICE does not match expected message: - PATTERN: /^\[\d\d-\w\w\w-\d{4} \d\d:\d\d:\d\d\] NOTICE: Terminating ...$/ - MESSAGE: [04-Aug-2020 08:15:37] WARNING: [pool unconfined_status] server reached max_children setting (2), consider raising it - EXPECT: 'Terminating ...' - ACTUAL: '2020 08:15:37] WARNING: [pool unconfined_status] server reached max_children setting (2), consider raising it'
* | FPM: Add pm.status_listen optionJakub Zelenka2020-08-031-0/+51
| | | | | | | | | | | | | | | | | | | | This option allows getting status from different endpoint (e.g. port or UDS file) which is useful for getting status when all children are busy with serving long running requests. Internally a new shared pool with ondemand process manager is used. It means that the status requests have reserved resources and should not be blocked by other requests.
* | Merge branch 'PHP-7.4'Nikita Popov2020-06-231-0/+2
|\ \ | |/ | | | | | | * PHP-7.4: Restore XFAIL on fpm test
| * Restore XFAIL on fpm testNikita Popov2020-06-231-0/+2
| | | | | | | | Still fails intermittently.
* | Merge branch 'PHP-7.4'Nikita Popov2020-06-182-2/+2
|\ \ | |/
| * Fix race condition in FPM testsNikita Popov2020-06-182-2/+2
| | | | | | | | | | The newly de-XFAILed tests have a race condition. Make sure we terminate only after expecting all the log lines.
* | Merge branch 'PHP-7.4'Nikita Popov2020-06-182-4/+0
|\ \ | |/
| * Un-XFAIL FPM testsNikita Popov2020-06-182-4/+0
| | | | | | | | | | | | These were XFAILed due to a bug in the log implementation that caused intermittent failures. However, this issue is supposed to be resolved in the meantime, so try dropping the XFAIL marker.
* | Merge branch 'PHP-7.4'Matteo Beccati2020-04-024-1/+24
|\ \ | |/ | | | | | | | | * PHP-7.4: Skip fpm tests not designed to be run as root Allow fpm tests to be run with long socket path
| * Skip fpm tests not designed to be run as rootMatteo Beccati2020-04-024-0/+13
| | | | | | | | When running as root with TEST_FPM_RUN_AS_ROOT=1
| * Allow fpm tests to be run with long socket pathMatteo Beccati2020-04-021-1/+11
| | | | | | | | | | Socket path is restricted to ~100 bytes, so we can use the system temp dir if the path ends up too long.
* | Merge branch 'PHP-7.4'Jakub Zelenka2020-03-293-0/+176
|\ \ | |/
| * Allow numeric [UG]ID in FPM listen.{owner,group}Andre Nathan2020-03-293-0/+176
| |
* | Merge branch 'PHP-7.4'Nikita Popov2020-02-281-1/+2
|\ \ | |/ | | | | | | * PHP-7.4: Fix another flaky FPM test
| * Fix another flaky FPM testNikita Popov2020-02-281-1/+2
| |
* | Merge branch 'PHP-7.4'Nikita Popov2020-02-281-1/+2
|\ \ | |/ | | | | | | * PHP-7.4: Try to fix intermittent FPM failures
| * Try to fix intermittent FPM failuresNikita Popov2020-02-281-1/+2
| | | | | | | | | | Terminate only after expecting the log lines to avoid race condition.
* | Merge branch 'PHP-7.4'Jakub Zelenka2020-02-233-0/+144
|\ \ | |/
| * Fix bug #77653 (operator displayed instead of the real error message)Jakub Zelenka2020-02-233-0/+144
| |
* | Reindent phpt filesNikita Popov2020-02-032-22/+22
| |
* | Merge branch 'PHP-7.4'Nikita Popov2020-02-031-1/+3
|\ \ | |/ | | | | | | * PHP-7.4: Disable parallelism for FPM tests
| * Disable parallelism for FPM testsNikita Popov2020-02-031-1/+3
| | | | | | | | Let's see if this helps with spurious failures on Azure.
* | Merge branch 'PHP-7.4'Nikita Popov2020-01-271-0/+39
|\ \ | |/ | | | | | | * PHP-7.4: Fix bug #78323: Code 0 is returned on invalid options
| * Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-01-271-0/+39
| |\ | | | | | | | | | | | | * PHP-7.3: Fix bug #78323: Code 0 is returned on invalid options
| | * Fix bug #78323: Code 0 is returned on invalid optionsIvan Mikheykin2020-01-271-0/+39
| | | | | | | | | | | | | | | Set CLI exit code to 1 when invalid parameters are passed, and print error to stderr.
* | | Merge branch 'PHP-7.4'Nikita Popov2020-01-212-1/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Add sleep in FPM reload test
| * | Add sleep in FPM reload testNikita Popov2020-01-212-1/+5
| | | | | | | | | | | | Explicitly mark the point where we have to wait.
* | | Fix #78880: Yet another batch of spelling errorsMáté Kocsis2020-01-161-1/+1
| | |
* | | Fix #78880: Another bunch of spelling errorsMáté Kocsis2020-01-162-4/+4
| | |
* | | Merge branch 'PHP-7.4'Nikita Popov2020-01-091-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Increase select timeout in FPM tester
| * | Increase select timeout in FPM testerNikita Popov2020-01-091-1/+1
| | | | | | | | | | | | Let's see if that helps with the recent failure spree on Azure.
* | | Merge branch 'PHP-7.4'Nikita Popov2020-01-081-3/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Revert "Display a message if select in FPM test timeouts"
| * | Revert "Display a message if select in FPM test timeouts"Nikita Popov2020-01-081-3/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit e2361498d519561e7eb5b73d138c1eaa80da2a20. Ooops, this occurs normally during some tests, but I didn't notice because I have slow tests disabled...
* | | Merge branch 'PHP-7.4'Nikita Popov2020-01-081-1/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Display a message if select in FPM test timeouts
| * | Display a message if select in FPM test timeoutsNikita Popov2020-01-081-1/+3
| | |
* | | Merge branch 'PHP-7.4'Jakub Zelenka2019-11-171-0/+92
|\ \ \ | |/ /
| * | Do not let PHP-FPM children miss SIGTERM, SIGQUITMaksim Nikulin2019-11-171-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postpone signal delivery while spawning children. Prevent the following case: - Reload (reexec) is in progress. - New master is forking to start enough children for pools where `pm` is not `on-demand`. - Another `SIGUSR2` is received by the master process. - Master process switches to reloading state. - Some child has not set its own signal handlers. - `SIGQUIT` and `SIGTERM` sent by master process are caught by signal handler set by master process and so they are ignored. - A child is running, it has no reason to finish Before pull request #4465 this scenario could cause deadlock, however with 0ed6c37140 reload finishes after `SIGKILL`. Use sigprocmask() around fork() to avoid race of delivery signal to children and setting of own signal handlers. Fixes bug #76601
* | | Merge branch 'PHP-7.4'Stanislav Malyshev2019-10-212-2/+70
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-7.4: Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) bump versions after release set versions for release
| * | Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2019-10-212-2/+70
| |\ \ | | |/ | | | | | | | | | | | | | | | * PHP-7.3: Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) bump versions after release set versions for release
View Lorry Controller Status