You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2021/07/31 13:36:20 UTC
svn commit: r1891919 - in /httpd/httpd/trunk:
changes-entries/core_child_stopping.txt include/ap_mmn.h
include/mpm_common.h server/mpm/event/event.c server/mpm/prefork/prefork.c
server/mpm/worker/worker.c server/mpm_common.c
Author: icing
Date: Sat Jul 31 13:36:19 2021
New Revision: 1891919
URL: http://svn.apache.org/viewvc?rev=1891919&view=rev
Log:
* core/mpm: add hook 'child_stopping` that gets called when the MPM is
stopping a child process. The additional `graceful` parameter allows
registered hooks to free resources early during a graceful shutdown.
Added:
httpd/httpd/trunk/changes-entries/core_child_stopping.txt
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/include/mpm_common.h
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm/prefork/prefork.c
httpd/httpd/trunk/server/mpm/worker/worker.c
httpd/httpd/trunk/server/mpm_common.c
Added: httpd/httpd/trunk/changes-entries/core_child_stopping.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/changes-entries/core_child_stopping.txt?rev=1891919&view=auto
==============================================================================
--- httpd/httpd/trunk/changes-entries/core_child_stopping.txt (added)
+++ httpd/httpd/trunk/changes-entries/core_child_stopping.txt Sat Jul 31 13:36:19 2021
@@ -0,0 +1,4 @@
+ * core/mpm: add hook 'child_stopping` that gets called when the MPM is
+ stopping a child process. The additional `graceful` parameter allows
+ registered hooks to free resources early during a graceful shutdown.
+ [Yann Ylavic, Stefan Eissing]
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1891919&r1=1891918&r2=1891919&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Sat Jul 31 13:36:19 2021
@@ -677,6 +677,8 @@
* ap_bucket_wc_create() to util_filter.h
* 20210531.2 (2.5.1-dev) Add ap_proxy_get_worker_ex() and
* ap_proxy_define_worker_ex() to mod_proxy.h
+ * 20210531.3 (2.5.1-dev) Add hook child_stopping to get informed that a child
+ * is being shut down.
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
Modified: httpd/httpd/trunk/include/mpm_common.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/mpm_common.h?rev=1891919&r1=1891918&r2=1891919&view=diff
==============================================================================
--- httpd/httpd/trunk/include/mpm_common.h (original)
+++ httpd/httpd/trunk/include/mpm_common.h Sat Jul 31 13:36:19 2021
@@ -511,6 +511,15 @@ AP_DECLARE_HOOK(void, suspend_connection
AP_DECLARE_HOOK(void, resume_connection,
(conn_rec *c, request_rec *r))
+/**
+ * Notification that the child is stopping. If graceful, ongoing
+ * requests will be served.
+ * @param pchild The child pool
+ * @param graceful != 0 iff this is a graceful shutdown.
+ */
+AP_DECLARE_HOOK(void, child_stopping,
+ (apr_pool_t *pchild, int graceful))
+
/* mutex type string for accept mutex, if any; MPMs should use the
* same mutex type for ease of configuration
*/
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1891919&r1=1891918&r2=1891919&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Sat Jul 31 13:36:19 2021
@@ -659,6 +659,8 @@ static void signal_threads(int mode)
ap_queue_interrupt_all(worker_queue);
close_worker_sockets(); /* forcefully kill all current connections */
}
+
+ ap_run_child_stopping(pchild, mode == ST_GRACEFUL);
}
static int event_query(int query_code, int *result, apr_status_t *rv)
@@ -758,6 +760,10 @@ static void clean_child_exit(int code) _
static void clean_child_exit(int code)
{
retained->mpm->mpm_state = AP_MPMQ_STOPPING;
+ if (terminate_mode == ST_INIT) {
+ ap_run_child_stopping(pchild, 0);
+ }
+
if (pchild) {
apr_pool_destroy(pchild);
}
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1891919&r1=1891918&r2=1891919&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Sat Jul 31 13:36:19 2021
@@ -219,11 +219,14 @@ static void prefork_note_child_started(i
static void clean_child_exit(int code) __attribute__ ((noreturn));
static void clean_child_exit(int code)
{
- retained->mpm->mpm_state = AP_MPMQ_STOPPING;
-
apr_signal(SIGHUP, SIG_IGN);
apr_signal(SIGTERM, SIG_IGN);
+ retained->mpm->mpm_state = AP_MPMQ_STOPPING;
+ if (code == 0) {
+ ap_run_child_stopping(pchild, 0);
+ }
+
if (pchild) {
apr_pool_destroy(pchild);
/*
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=1891919&r1=1891918&r2=1891919&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Sat Jul 31 13:36:19 2021
@@ -325,6 +325,8 @@ static void signal_threads(int mode)
ap_queue_interrupt_all(worker_queue);
close_worker_sockets(); /* forcefully kill all current connections */
}
+
+ ap_run_child_stopping(pchild, mode == ST_GRACEFUL);
}
static int worker_query(int query_code, int *result, apr_status_t *rv)
@@ -433,6 +435,10 @@ static void clean_child_exit(int code) _
static void clean_child_exit(int code)
{
retained->mpm->mpm_state = AP_MPMQ_STOPPING;
+ if (terminate_mode == ST_INIT) {
+ ap_run_child_stopping(pchild, 0);
+ }
+
if (pchild) {
apr_pool_destroy(pchild);
}
Modified: httpd/httpd/trunk/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=1891919&r1=1891918&r2=1891919&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Sat Jul 31 13:36:19 2021
@@ -77,7 +77,8 @@
APR_HOOK_LINK(output_pending) \
APR_HOOK_LINK(input_pending) \
APR_HOOK_LINK(suspend_connection) \
- APR_HOOK_LINK(resume_connection)
+ APR_HOOK_LINK(resume_connection) \
+ APR_HOOK_LINK(child_stopping)
#if AP_ENABLE_EXCEPTION_HOOK
APR_HOOK_STRUCT(
@@ -136,6 +137,9 @@ AP_IMPLEMENT_HOOK_VOID(suspend_connectio
AP_IMPLEMENT_HOOK_VOID(resume_connection,
(conn_rec *c, request_rec *r),
(c, r))
+AP_IMPLEMENT_HOOK_VOID(child_stopping,
+ (apr_pool_t *pchild, int graceful),
+ (pchild, graceful))
/* hooks with no args are implemented last, after disabling APR hook probes */
#if defined(APR_HOOK_PROBES_ENABLED)