Skip to content

Resolve issue #6 - retain vhost global lock between graceful restarts, #7

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
Open

Resolve issue #6 - retain vhost global lock between graceful restarts, #7

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
53 changes: 30 additions & 23 deletions modules/bmx/mod_bmx_vhost.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,33 +986,40 @@ static int bmx_vhost_post_config(apr_pool_t *pconf, apr_pool_t *plog,
}
#endif

/* create a mutex to protect the DBM */
rv = apr_global_mutex_create(&dbmlock, dbmlock_fname, APR_LOCK_DEFAULT,
s->process->pool);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, "Failed to create "
"mod_bmx_vhost global mutex for DBM in file '%s'",
dbmlock_fname);
rv = HTTP_INTERNAL_SERVER_ERROR;
goto out;
}
/* Check if this is configtest or a preflight phase, clear nothing,
* but create a process-lifespan mutex to protect the DBM. This must
* survive graceful restarts (s->process->pool) because two generations
* may be manipulating the same DBM at once, so the dbmlock directives
* are only recognized at initial startup.
* TODO: XXX: Implement httpd 2.4 Mutex schema for global defaults.
*/
apr_pool_userdata_get((void**)&dbmlock, preflight_key, s->process->pool);
if (!dbmlock)
{
/* create a mutex to protect the DBM */
rv = apr_global_mutex_create(&dbmlock, dbmlock_fname, APR_LOCK_DEFAULT,
s->process->pool);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, "Failed to create "
"mod_bmx_vhost global mutex for DBM in file '%s'",
dbmlock_fname);
rv = HTTP_INTERNAL_SERVER_ERROR;
goto out;
}

#ifdef AP_NEED_SET_MUTEX_PERMS
rv = unixd_set_global_mutex_perms(dbmlock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
"mod_bmx_vhost could not set permissions on global mutex"
" for DBM in file '%s'; check User and Group directives",
dbmlock_fname);
rv = HTTP_INTERNAL_SERVER_ERROR;
goto out;
}
rv = unixd_set_global_mutex_perms(dbmlock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
"mod_bmx_vhost could not set permissions on global"
" mutex for DBM in file '%s'; check User and Group"
" directives", dbmlock_fname);
rv = HTTP_INTERNAL_SERVER_ERROR;
goto out;
}
#endif

/* Check if this is configtest or a preflight phase, clear nothing! */
apr_pool_userdata_get(&preflight, preflight_key, s->process->pool);
if (!preflight) {
apr_pool_userdata_set(preflight_key, preflight_key,
apr_pool_userdata_set(dbmlock, preflight_key,
apr_pool_cleanup_null, s->process->pool);
rv = OK;
goto out;
Expand Down