From cbdb8df34bcaf29167f165f44ccc50494fb4e661 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Thu, 1 Jun 2023 18:09:48 +0900 Subject: [PATCH] config: bin: Ensure thread safety on reloading by default Signed-off-by: Hiroshi Hatake --- src/flb_config.c | 3 +++ src/fluent-bit.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/flb_config.c b/src/flb_config.c index 826ba95668c..0b9cc578ba6 100644 --- a/src/flb_config.c +++ b/src/flb_config.c @@ -272,6 +272,9 @@ struct flb_config *flb_config_init() config->sched_cap = FLB_SCHED_CAP; config->sched_base = FLB_SCHED_BASE; + /* reload */ + config->ensure_thread_safety_on_hot_reloading = FLB_TRUE; + #ifdef FLB_HAVE_SQLDB mk_list_init(&config->sqldb_list); #endif diff --git a/src/fluent-bit.c b/src/fluent-bit.c index a00c3b20d66..46e159b2159 100644 --- a/src/fluent-bit.c +++ b/src/fluent-bit.c @@ -150,7 +150,7 @@ static void flb_help(int rc, struct flb_config *config) print_opt("-q, --quiet", "quiet mode"); print_opt("-S, --sosreport", "support report for Enterprise customers"); print_opt("-Y, --enable-hot-reload", "enable for hot reloading"); - print_opt("-W, --ensure-thread-safety-on-hot-reloading", "ensure thread safety on hot reloading"); + print_opt("-W, --disable-thread-safety-on-hot-reloading", "disable thread safety on hot reloading"); print_opt("-V, --version", "show version number"); print_opt("-h, --help", "print this help"); @@ -805,7 +805,7 @@ int flb_main(int argc, char **argv) #ifdef FLB_HAVE_CHUNK_TRACE { "enable-chunk-trace", no_argument, NULL, 'Z' }, #endif - { "ensure-thread-safety-on-hot-reload", no_argument, NULL, 'W' }, + { "disable-thread-safety-on-hot-reload", no_argument, NULL, 'W' }, { NULL, 0, NULL, 0 } }; @@ -992,7 +992,7 @@ int flb_main(int argc, char **argv) break; case 'W': flb_cf_section_property_add(cf_opts, service->properties, - FLB_CONF_STR_HOT_RELOAD_ENSURE_THREAD_SAFETY, 0, "on", 0); + FLB_CONF_STR_HOT_RELOAD_ENSURE_THREAD_SAFETY, 0, "off", 0); break; #ifdef FLB_HAVE_CHUNK_TRACE case 'Z':