Skip to content

Commit

Permalink
BUG/MINOR: startup: close pidfd and free global.pidfile in handle_pid…
Browse files Browse the repository at this point in the history
…file()

After master-worker mode refactoring, global.pidfile is only used in
handle_pidfile(), which opens the provided file and writes the PID into it. So,
it's more appropriate to perform the close(pidfd) and ha_free(&global.pidfile)
also in this function.

This commit prepares the fix of the pidfile creation, as it's created now very
early, when we are not sure, that process has successfully started. In
master-worker mode handle_pidfile() can be called in the master process context.
So, let's make it accessible from other compilation units via global.h.

This should be backported only in 3.1.
  • Loading branch information
vkssv authored and wtarreau committed Dec 2, 2024
1 parent d3c20b0 commit a33977d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
1 change: 1 addition & 0 deletions include/haproxy/global.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ void hap_register_feature(const char *name);
int split_version(const char *version, unsigned int *value);
int compare_current_version(const char *version);
void display_version();
void handle_pidfile(void);

void mworker_accept_wrapper(int fd);

Expand Down
13 changes: 4 additions & 9 deletions src/haproxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1777,7 +1777,7 @@ static void apply_daemon_mode()
}

/* Only returns if everything is OK. If something fails, it exits. */
static void handle_pidfile()
void handle_pidfile(void)
{
char pidstr[100];

Expand All @@ -1792,6 +1792,9 @@ static void handle_pidfile()
}
snprintf(pidstr, sizeof(pidstr), "%d\n", (int)getpid());
DISGUISE(write(pidfd, pidstr, strlen(pidstr)));
close(pidfd);
/* We won't ever use this anymore */
ha_free(&global.pidfile);
}

static void get_listeners_fd()
Expand Down Expand Up @@ -2568,14 +2571,6 @@ static void step_init_4(void)
clock_update_date(0, 1);
clock_adjust_now_offset();
ready_date = date;

/* close the pidfile both in children and father */
if (pidfd >= 0) {
//lseek(pidfd, 0, SEEK_SET); /* debug: emulate eglibc bug */
close(pidfd);
}
/* We won't ever use this anymore */
ha_free(&global.pidfile);
}

/* This function sets verbosity modes. Should be called after the first
Expand Down

0 comments on commit a33977d

Please sign in to comment.