Skip to content

reload: refactor watchdog to be preemptable on windows. [Backport to 4.0] #10988

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
cosmo0920 merged 1 commit into from
Oct 6, 2025
Merged

reload: refactor watchdog to be preemptable on windows. [Backport to 4.0] #10988

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
8 changes: 7 additions & 1 deletion src/flb_reload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,16 @@ struct flb_reload_watchdog_ctx {

static void *hot_reload_watchdog_thread(void *arg)
{
int loop_sleep;
struct flb_reload_watchdog_ctx *ctx = (struct flb_reload_watchdog_ctx *)arg;

/* Set async cancellation type for (mostly) immediate response to pthread_cancel */
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);

flb_time_msleep(ctx->timeout_seconds * 1000);
/* loop for each sleep in a busy pattern to avoid delaying flb_reload() */
for (loop_sleep = 0; loop_sleep < ctx->timeout_seconds*10; loop_sleep++) {
flb_time_msleep(100);
}

flb_error("[hot_reload_watchdog] Hot reload timeout exceeded (%d seconds), "
"aborting to prevent indefinite hang", ctx->timeout_seconds);
Expand Down Expand Up @@ -621,7 +625,9 @@ int flb_reload(flb_ctx_t *ctx, struct flb_cf *cf_opts)
new_config->hot_reload_succeeded = FLB_TRUE;

/* Cancel the watchdog thread since reload completed successfully */
flb_debug("[reload] cleanup watchdog");
flb_reload_watchdog_cleanup(watchdog_ctx);

flb_info("[reload] successful reload done.");
return 0;
}
Loading