Skip to content

ext/opcache: Retry waitpid on EINTR from repeated reload signals #20051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −2
Open

ext/opcache: Retry waitpid on EINTR from repeated reload signals #20051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions ext/opcache/ZendAccelerator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4877,10 +4877,24 @@ static zend_result accel_finish_startup(void)
exit(ret == SUCCESS ? 0 : 1);
} else { /* parent */
int status;
pid_t chld_pid;

/* Handle EINTR from reload signal storms during preload.
*
* Problem: Legacy deployment workflows or monitoring systems may send
* multiple SIGUSR1/SIGUSR2 signals before the previous reload finishes.
* Because some SAPIs register these handlers without SA_RESTART, system calls
* are interrupted (EINTR) rather than automatically restarted.
*
* Without this retry loop, repeated signals can cause waitpid() to fail
* non-deterministically, leading to premature master process exit. */
do {
chld_pid = waitpid(pid, &status, 0);
} while (chld_pid < 0 && errno == EINTR);
Comment on lines +4891 to +4893
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks right, except we probably have to check for a stronger signals (e.g. SIGQUIT).
Otherwise we may hung in this loop forever.
@arnaud-lb can you please take care about this.


if (waitpid(pid, &status, 0) < 0) {
if (chld_pid < 0) {
zend_shared_alloc_unlock();
zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Preloading failed to waitpid(%d)", pid);
zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Preloading failed to waitpid(%d) with errno=%s", pid, strerror(errno));
}

if (ZCSG(preload_script)) {
Expand Down