Skip to content

bin: config: Provide windows.maxstdio option for increasing I/O limit on Windows #9707

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
merged 4 commits into from
May 8, 2025
Merged

bin: config: Provide windows.maxstdio option for increasing I/O limit on Windows #9707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bf8f0f
bin: config: Provide maxstdio option for increasing I/O limit on Windows
cosmo0920 Dec 11, 2024
3912cab
config: Add windows/. prefix into maxstdio parameter
cosmo0920 Dec 30, 2024
c1c509d
config: bin: Add prefix for windows specific functuionality
cosmo0920 Jan 9, 2025
7d9dbf4
engine: Display the current maxstdio value on debug level log
cosmo0920 Jan 24, 2025
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
7 changes: 7 additions & 0 deletions include/fluent-bit/flb_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,10 @@ struct flb_config {
size_t route_mask_size;
size_t route_mask_slots;
uint64_t *route_empty_mask;
#ifdef FLB_SYSTEM_WINDOWS
/* maxstdio (Windows) */
int win_maxstdio;
#endif

/* Co-routines */
unsigned int coro_stack_size;
Expand Down Expand Up @@ -373,6 +377,9 @@ enum conf_type {
#define FLB_CONF_STR_HOT_RELOAD "Hot_Reload"
#define FLB_CONF_STR_HOT_RELOAD_ENSURE_THREAD_SAFETY "Hot_Reload.Ensure_Thread_Safety"

/* Set up maxstdio (Windows) */
#define FLB_CONF_STR_WINDOWS_MAX_STDIO "windows.maxstdio"

/* DNS */
#define FLB_CONF_DNS_MODE "dns.mode"
#define FLB_CONF_DNS_RESOLVER "dns.resolver"
Expand Down
9 changes: 9 additions & 0 deletions src/flb_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ struct flb_service_config service_configs[] = {
offsetof(struct flb_config, enable_chunk_trace)},
#endif

#ifdef FLB_SYSTEM_WINDOWS
{FLB_CONF_STR_WINDOWS_MAX_STDIO,
FLB_CONF_TYPE_INT,
offsetof(struct flb_config, win_maxstdio)},
#endif
{FLB_CONF_STR_HOT_RELOAD,
FLB_CONF_TYPE_BOOL,
offsetof(struct flb_config, enable_hot_reload)},
Expand Down Expand Up @@ -291,6 +296,10 @@ struct flb_config *flb_config_init()
config->shutdown_by_hot_reloading = FLB_FALSE;
config->hot_reloading = FLB_FALSE;

#ifdef FLB_SYSTEM_WINDOWS
config->win_maxstdio = 512;
#endif

#ifdef FLB_HAVE_SQLDB
mk_list_init(&config->sqldb_list);
#endif
Expand Down
3 changes: 3 additions & 0 deletions src/flb_engine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,9 @@ int flb_engine_start(struct flb_config *config)
flb_info("[fluent bit] version=%s, commit=%.10s, pid=%i",
FLB_VERSION_STR, FLB_GIT_HASH, getpid());

#ifdef FLB_SYSTEM_WINDOWS
flb_debug("[engine] maxstdio set: %d", _getmaxstdio());
#endif
/* Debug coroutine stack size */
flb_utils_bytes_to_human_readable_size(config->coro_stack_size,
tmp, sizeof(tmp));
Expand Down
23 changes: 22 additions & 1 deletion src/fluent-bit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,6 +1067,9 @@ int flb_main(int argc, char **argv)
{ "http_port", required_argument, NULL, 'P' },
#endif
{ "enable-hot-reload", no_argument, NULL, 'Y' },
#ifdef FLB_SYSTEM_WINDOWS
{ "windows_maxstdio", required_argument, NULL, 'M' },
#endif
#ifdef FLB_HAVE_CHUNK_TRACE
{ "enable-chunk-trace", no_argument, NULL, 'Z' },
{ "trace", required_argument, NULL, FLB_LONG_TRACE },
Expand Down Expand Up @@ -1104,7 +1107,7 @@ int flb_main(int argc, char **argv)

/* Parse the command line options */
while ((opt = getopt_long(argc, argv,
"b:c:dDf:C:i:m:o:R:r:F:p:e:"
"b:c:dDf:C:i:m:M:o:R:r:F:p:e:"
"t:T:l:vw:qVhJL:HP:s:SWYZ",
long_opts, NULL)) != -1) {

Expand Down Expand Up @@ -1159,6 +1162,12 @@ int flb_main(int argc, char **argv)
flb_cf_section_property_add(cf_opts, s->properties, "match", 0, optarg, 0);
}
break;
#ifdef FLB_SYSTEM_WINDOWS
case 'M':
flb_cf_section_property_add(cf_opts, service->properties,
"windows.maxstdio", 0, optarg, 0);
break;
#endif
case 'o':
s = flb_cf_section_create(cf_opts, "output", 0);
if (!s) {
Expand Down Expand Up @@ -1391,6 +1400,18 @@ int flb_main(int argc, char **argv)
#endif

#ifdef FLB_SYSTEM_WINDOWS
/* Validate specified maxstdio */
if (config->win_maxstdio >= 512 && config->win_maxstdio <= 2048) {
_setmaxstdio(config->win_maxstdio);
}
else {
fprintf(stderr,
"windows.maxstdio is invalid. From 512 to 2048 is vaild but got %d\n",
config->win_maxstdio);
flb_free(cfg_file);
flb_cf_destroy(cf_opts);
exit(EXIT_FAILURE);
}
win32_started();
#endif

Expand Down
Loading