mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: mworker: remove any relative PID reference

Browse Source 
nbproc was removed, it's time to remove any reference to the relative
PID in the master-worker, since there can be only 1 current haproxy
process.

This patch cleans up the alerts and warnings emitted during the exit of
a process, as well as the "show proc" output.
This commit is contained in:
William Lallemand 2021-11-09 15:25:31 +01:00
parent f14d750bf7
commit 5d71a6b0f1
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/haproxy.c
View File

@ -3191,7 +3191,7 @@ int main(int argc, char **argv)
if (global.mode & MODE_MWORKER) { if (global.mode & MODE_MWORKER) {
struct mworker_proc *child; struct mworker_proc *child;
ha_notice("New worker #%d (%d) forked\n", 1, ret); ha_notice("New worker (%d) forked\n", ret);
/* find the right mworker_proc */ /* find the right mworker_proc */
list_for_each_entry(child, &proc_list, list) { list_for_each_entry(child, &proc_list, list) {
if (child->reloads == 0 && child->options & PROC_O_TYPE_WORKER) { if (child->reloads == 0 && child->options & PROC_O_TYPE_WORKER) {

21
src/mworker.c
View File

@ -122,7 +122,7 @@ void mworker_proc_list_to_env()
type = 'w'; type = 'w';
if (child->pid > -1) if (child->pid > -1)
memprintf(&msg, "%s|type=%c;fd=%d;pid=%d;rpid=%d;reloads=%d;timestamp=%d;id=%s;version=%s", msg ? msg : "", type, child->ipc_fd[0], child->pid, 1, child->reloads, child->timestamp, child->id ? child->id : "", child->version); memprintf(&msg, "%s|type=%c;fd=%d;pid=%d;reloads=%d;timestamp=%d;id=%s;version=%s", msg ? msg : "", type, child->ipc_fd[0], child->pid, child->reloads, child->timestamp, child->id ? child->id : "", child->version);
} }
if (msg) if (msg)
setenv("HAPROXY_PROCESSES", msg, 1); setenv("HAPROXY_PROCESSES", msg, 1);
@ -296,9 +296,9 @@ restart_wait:
if (!(child->options & PROC_O_LEAVING)) { if (!(child->options & PROC_O_LEAVING)) {
if (child->options & PROC_O_TYPE_WORKER) { if (child->options & PROC_O_TYPE_WORKER) {
if (status < 128) if (status < 128)
ha_warning("Current worker #%d (%d) exited with code %d (%s)\n", 1, exitpid, status, "Exit"); ha_warning("Current worker (%d) exited with code %d (%s)\n", exitpid, status, "Exit");
else else
ha_alert("Current worker #%d (%d) exited with code %d (%s)\n", 1, exitpid, status, strsignal(status - 128)); ha_alert("Current worker (%d) exited with code %d (%s)\n", exitpid, status, strsignal(status - 128));
} }
else if (child->options & PROC_O_TYPE_PROG) else if (child->options & PROC_O_TYPE_PROG)
ha_alert("Current program '%s' (%d) exited with code %d (%s)\n", child->id, exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit"); ha_alert("Current program '%s' (%d) exited with code %d (%s)\n", child->id, exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit");
@ -313,7 +313,7 @@ restart_wait:
exitcode = status; exitcode = status;
} else { } else {
if (child->options & PROC_O_TYPE_WORKER) { if (child->options & PROC_O_TYPE_WORKER) {
ha_warning("Former worker #%d (%d) exited with code %d (%s)\n", 1, exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit"); ha_warning("Former worker (%d) exited with code %d (%s)\n", exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit");
delete_oldpid(exitpid); delete_oldpid(exitpid);
} else if (child->options & PROC_O_TYPE_PROG) { } else if (child->options & PROC_O_TYPE_PROG) {
ha_warning("Former program '%s' (%d) exited with code %d (%s)\n", child->id, exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit"); ha_warning("Former program '%s' (%d) exited with code %d (%s)\n", child->id, exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit");
@ -461,9 +461,9 @@ static int cli_io_handler_show_proc(struct appctx *appctx)
chunk_reset(&trash); chunk_reset(&trash);
chunk_printf(&trash, "#%-14s %-15s %-15s %-15s %-15s %-15s\n", "<PID>", "<type>", "<relative PID>", "<reloads>", "<uptime>", "<version>"); chunk_printf(&trash, "#%-14s %-15s %-15s %-15s %-15s\n", "<PID>", "<type>", "<reloads>", "<uptime>", "<version>");
memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60));
chunk_appendf(&trash, "%-15u %-15s %-15u %-15d %-15s %-15s\n", (unsigned int)getpid(), "master", 0, proc_self->reloads, uptime, haproxy_version); chunk_appendf(&trash, "%-15u %-15s %-15d %-15s %-15s\n", (unsigned int)getpid(), "master", proc_self->reloads, uptime, haproxy_version);
ha_free(&uptime); ha_free(&uptime);
/* displays current processes */ /* displays current processes */
@ -480,7 +480,7 @@ static int cli_io_handler_show_proc(struct appctx *appctx)
continue; continue;
} }
memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60));
chunk_appendf(&trash, "%-15u %-15s %-15u %-15d %-15s %-15s\n", child->pid, "worker", 1, child->reloads, uptime, child->version); chunk_appendf(&trash, "%-15u %-15s %-15d %-15s %-15s\n", child->pid, "worker", child->reloads, uptime, child->version);
ha_free(&uptime); ha_free(&uptime);
} }
@ -497,9 +497,8 @@ static int cli_io_handler_show_proc(struct appctx *appctx)
continue; continue;
if (child->options & PROC_O_LEAVING) { if (child->options & PROC_O_LEAVING) {
memprintf(&msg, "[was: %u]", 1);
memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60));
chunk_appendf(&trash, "%-15u %-15s %-15s %-15d %-15s %-15s\n", child->pid, "worker", msg, child->reloads, uptime, child->version); chunk_appendf(&trash, "%-15u %-15s %-15d %-15s %-15s\n", child->pid, "worker", child->reloads, uptime, child->version);
ha_free(&uptime); ha_free(&uptime);
} }
} }
@ -520,7 +519,7 @@ static int cli_io_handler_show_proc(struct appctx *appctx)
continue; continue;
} }
memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60));
chunk_appendf(&trash, "%-15u %-15s %-15s %-15d %-15s %-15s\n", child->pid, child->id, "-", child->reloads, uptime, "-"); chunk_appendf(&trash, "%-15u %-15s %-15d %-15s %-15s\n", child->pid, child->id, child->reloads, uptime, "-");
ha_free(&uptime); ha_free(&uptime);
} }
@ -534,7 +533,7 @@ static int cli_io_handler_show_proc(struct appctx *appctx)
if (child->options & PROC_O_LEAVING) { if (child->options & PROC_O_LEAVING) {
memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60));
chunk_appendf(&trash, "%-15u %-15s %-15s %-15d %-15s %-15s\n", child->pid, child->id, "-", child->reloads, uptime, "-"); chunk_appendf(&trash, "%-15u %-15s %-15d %-15s %-15s\n", child->pid, child->id, child->reloads, uptime, "-");
ha_free(&uptime); ha_free(&uptime);
} }
} }