From 3040f75f434f64756655faba9d1eaaa76e4babb0 Mon Sep 17 00:00:00 2001 From: Felix Wiedemann Date: Mon, 18 Jul 2022 08:28:49 +0200 Subject: [PATCH] FPM: Downgrade occasional "failed to acquire scoreboard" warning With request timeouts configured, php-fpm occasionally prints the following warning: WARNING: failed to acquire scoreboard This is happens when php-fpm checks the child scoreboards for timeouts, but fails to acquire a lock immediately. As this can (and does) occur during normal operation, this commit downgrades this to a notice. Closes #9019. --- NEWS | 2 ++ sapi/fpm/fpm/fpm_request.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index f9632c86d90..73f0d5f37a6 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,8 @@ PHP NEWS - FPM: . Fixed zlog message prepend, free on incorrect address. (Heiko Weber) . Fixed possible double free on configuration loading failure. (Heiko Weber). + . Fixed on fpm scoreboard occasional warning on acquisition failure. + (Felix Wiedemann) - GD: . Fixed bug GH-8848 (imagecopyresized() error refers to the wrong argument). diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index 4f51824138d..47ebe8e16a5 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -231,7 +231,7 @@ void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now, proc_p = fpm_scoreboard_proc_acquire(child->wp->scoreboard, child->scoreboard_i, 1); if (!proc_p) { - zlog(ZLOG_WARNING, "failed to acquire scoreboard"); + zlog(ZLOG_NOTICE, "failed to acquire scoreboard"); return; }