Skip to content

Fix for MODCLUSTER-841, use updated to propagate the status and error_time. #849

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

Merged
jajik merged 1 commit into from
Nov 20, 2024
Merged

Fix for MODCLUSTER-841, use updated to propagate the status and error_time. #849

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
44 changes: 44 additions & 0 deletions native/mod_proxy_cluster/mod_proxy_cluster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2335,11 +2335,13 @@ static int proxy_node_isup(request_rec *r, int id, int load)
}
}
else {
apr_time_t now = apr_time_now();
worker->s->status &= ~PROXY_WORKER_IN_ERROR;
worker->s->status &= ~PROXY_WORKER_STOPPED;
worker->s->status &= ~PROXY_WORKER_DISABLED;
worker->s->status &= ~PROXY_WORKER_HOT_STANDBY;
worker->s->lbfactor = load;
worker->s->updated = now;
if (http_worker != NULL) {
/* the ws/wss doesn't point to shared memory, so fix the http/https part */
http_worker->s->error_time = 0; /* we know the worker is OK ;-) */
Expand All @@ -2348,6 +2350,7 @@ static int proxy_node_isup(request_rec *r, int id, int load)
http_worker->s->status &= ~PROXY_WORKER_DISABLED;
http_worker->s->status &= ~PROXY_WORKER_HOT_STANDBY;
http_worker->s->lbfactor = load;
http_worker->s->updated = now;
}
}
return 0;
Expand Down Expand Up @@ -2540,6 +2543,8 @@ static void * APR_THREAD_FUNC proxy_cluster_watchdog_func(apr_thread_t *thd, voi
}

while (s) {
int i;
proxy_balancer *balancer;
sconf = s->module_config;
conf = (proxy_server_conf *)
ap_get_module_config(sconf, &proxy_module);
Expand All @@ -2556,6 +2561,45 @@ static void * APR_THREAD_FUNC proxy_cluster_watchdog_func(apr_thread_t *thd, voi
/* Free sessionid slots */
if (sessionid_storage)
remove_timeout_sessionid(conf, pool, s);

/* synchronize the http_worker when we have WS or WSS */
balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++, balancer++) {
int j;
proxy_worker **workers;
workers = (proxy_worker **)balancer->workers->elts;
for (j = 0; j < balancer->workers->nelts; j++, workers++) {
proxy_worker *worker = *workers;
if (strcasecmp(worker->s->scheme, "WSS") == 0 ||
strcasecmp(worker->s->scheme, "WS") == 0) {
proxy_worker *http_worker;
http_worker = get_http_worker(s, worker);
if (http_worker != NULL) {
if (http_worker->s->status != worker->s->status ||
http_worker->s->error_time != worker->s->error_time) {
ap_log_error(APLOG_MARK, APLOG_TRACE8, 0, s,
"proxy_cluster_watchdog_func status(%d %d) error_time (%ld %ld) updated (%ld %ld) pid: %d %s",
http_worker->s->status, worker->s->status,
http_worker->s->error_time, worker->s->error_time,
http_worker->s->updated, worker->s->updated,
getpid(),
#if MODULE_MAGIC_NUMBER_MAJOR == 20120211 && MODULE_MAGIC_NUMBER_MINOR >= 124
worker->s->name_ex);
#else
worker->s->name);
#endif
/* The STATUS sets the worker->s->updated */
if (http_worker->s->updated < worker->s->updated) {
http_worker->s->status = worker->s->status;
http_worker->s->error_time = worker->s->error_time;
http_worker->s->updated = apr_time_now();
}
}
}
}
}
}

s = s->next;
}
apr_pool_destroy(pool);
Expand Down
Loading