Skip to content

engine: Plug a race on starting engine #12347

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
cosmo0920 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

engine: Plug a race on starting engine #12347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa0a472
engine: Plug a race on starting engine
cosmo0920 Aug 28, 2026
4e10e23
config: skip closing ch_notif[1] when it's no longer a valid fd
cosmo0920 Aug 28, 2026
819ab7d
engine: Ensure engine shutdown on library mode
cosmo0920 Aug 28, 2026
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
3 changes: 2 additions & 1 deletion src/flb_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,8 @@ void flb_config_exit(struct flb_config *config)
/* Channel notifications */
if (config->ch_notif[0] > 0) {
mk_event_closesocket(config->ch_notif[0]);
if (config->ch_notif[0] != config->ch_notif[1]) {
if (config->ch_notif[1] > 0 &&
config->ch_notif[0] != config->ch_notif[1]) {
mk_event_closesocket(config->ch_notif[1]);
}
}
Expand Down
24 changes: 21 additions & 3 deletions src/flb_engine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,16 @@ int flb_engine_failed(struct flb_config *config)
ret = flb_pipe_w(config->ch_notif[1], &val, sizeof(uint64_t));
if (ret == -1) {
flb_error("[engine] fail to dispatch FAILED message");

/*
* A library mode caller may be blocked on the notification
* channel waiting for this message: close the write end so the
* reader wakes up with EOF instead of waiting forever.
*/
if (config->ch_notif[1] != config->ch_notif[0]) {
mk_event_closesocket(config->ch_notif[1]);
config->ch_notif[1] = -1;
}
}

/* Waiting flushing log */
Expand Down Expand Up @@ -1379,17 +1389,25 @@ int flb_engine_start(struct flb_config *config)
return -1;
}

/* Signal that we have started */
flb_engine_started(config);

/*
* Segregate the backlog chunks before notifying the library mode
* caller: segregation closes chunks that cannot be routed, so it must
* not run concurrently with callers inspecting storage right after
* flb_start() returns.
*/
ret = sb_segregate_chunks(config);

if (ret < 0)
{
flb_error("[engine] could not segregate backlog chunks");
flb_engine_failed(config);
flb_engine_shutdown(config);
return -2;
Comment thread
cosmo0920 marked this conversation as resolved.
}

/* Signal that we have started */
flb_engine_started(config);

config->grace_input = config->grace / 2;
flb_info("[engine] Shutdown Grace Period=%d, Shutdown Input Grace Period=%d", config->grace, config->grace_input);

Expand Down
Loading