Thank you Ilya and Alin. I have applied this patch to main. On Fri, Jun 5, 2026 at 11:46 AM Alin Serdean via dev <[email protected]> wrote: > > Acked-by: Alin Gabriel Serdean <[email protected]> > > On 2026-06-05T14:32:42.000+02:00, Ilya Maximets <[email protected]> > wrote: > > > This is one missed bit of the old Windows support. > > > > Interestingly, ovn-dbctl and ovn-trace didn't stop their services. > > > > Fixes: accc3e71b893 ("treewide: Remove shards of Windows support.") > > Signed-off-by: Ilya Maximets <[email protected]> > > --- > > br-controller/ovn-br-controller.c | 5 ----- > > controller-vtep/ovn-controller-vtep.c | 5 ----- > > controller/ovn-controller.c | 5 ----- > > ic/ovn-ic.c | 5 ----- > > northd/ovn-northd.c | 5 ----- > > utilities/ovn-dbctl.c | 7 +++---- > > utilities/ovn-trace.c | 1 - > > 7 files changed, 3 insertions(+), 30 deletions(-) > > > > diff --git a/br-controller/ovn-br-controller.c > > b/br-controller/ovn-br-controller.c > > index 93526a2f6..ca6db7db7 100644 > > --- a/br-controller/ovn-br-controller.c > > +++ b/br-controller/ovn-br-controller.c > > @@ -131,7 +131,6 @@ main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) > > > > ovs_cmdl_proctitle_init(argc, argv); > > ovn_set_program_name(argv[0]); > > - service_start(&argc, &argv); > > char *ovs_remote = parse_options(argc, argv); > > fatal_ignore_sigpipe(); > > > > @@ -322,9 +321,6 @@ main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) > > ovsdb_idl_track_clear(ovs_idl_loop.idl); > > > > poll_block(); > > - if (should_service_stop()) { > > - exit_args.exiting = true; > > - } > > } > > > > engine_set_context(NULL); > > @@ -333,7 +329,6 @@ main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) > > free(ovs_remote); > > ovn_exit_args_finish(&exit_args); > > unixctl_server_destroy(unixctl); > > - service_stop(); > > exit(0); > > } > > > > diff --git a/controller-vtep/ovn-controller-vtep.c > > b/controller-vtep/ovn-controller-vtep.c > > index c448c37b4..22ec416bd 100644 > > --- a/controller-vtep/ovn-controller-vtep.c > > +++ b/controller-vtep/ovn-controller-vtep.c > > @@ -115,7 +115,6 @@ main(int argc, char *argv[]) > > > > ovs_cmdl_proctitle_init(argc, argv); > > ovn_set_program_name(argv[0]); > > - service_start(&argc, &argv); > > parse_options(argc, argv); > > fatal_ignore_sigpipe(); > > > > @@ -229,9 +228,6 @@ main(int argc, char *argv[]) > > ovsdb_idl_loop_commit_and_wait(&vtep_idl_loop); > > ovsdb_idl_loop_commit_and_wait(&ovnsb_idl_loop); > > poll_block(); > > - if (should_service_stop()) { > > - exiting = true; > > - } > > } > > > > /* It's time to exit. Clean up the databases. */ > > @@ -267,7 +263,6 @@ main(int argc, char *argv[]) > > free(ovnsb_remote); > > free(vtep_remote); > > free(default_db_); > > - service_stop(); > > > > exit(retval); > > } > > diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c > > index ad094a454..fd848c54c 100644 > > --- a/controller/ovn-controller.c > > +++ b/controller/ovn-controller.c > > @@ -7459,7 +7459,6 @@ main(int argc, char *argv[]) > > > > ovs_cmdl_proctitle_init(argc, argv); > > ovn_set_program_name(argv[0]); > > - service_start(&argc, &argv); > > char *ovs_remote = parse_options(argc, argv); > > fatal_ignore_sigpipe(); > > > > @@ -8386,9 +8385,6 @@ loop_done: > > memory_wait(); > > ovsrcu_quiesce_start(); > > poll_block(); > > - if (should_service_stop()) { > > - exit_args.exiting = true; > > - } > > } > > > > const struct ovsrec_open_vswitch_table *ovs_table = > > @@ -8496,7 +8492,6 @@ loop_done: > > free(cli_system_id); > > ovn_exit_args_finish(&exit_args); > > unixctl_server_destroy(unixctl); > > - service_stop(); > > ovsrcu_exit(); > > dns_resolve_destroy(); > > route_exchange_destroy(); > > diff --git a/ic/ovn-ic.c b/ic/ovn-ic.c > > index fb7723641..0a3f2336b 100644 > > --- a/ic/ovn-ic.c > > +++ b/ic/ovn-ic.c > > @@ -3444,7 +3444,6 @@ main(int argc, char *argv[]) > > fatal_ignore_sigpipe(); > > ovs_cmdl_proctitle_init(argc, argv); > > ovn_set_program_name(argv[0]); > > - service_start(&argc, &argv); > > parse_options(argc, argv); > > > > daemonize_start(false, false); > > @@ -4063,9 +4062,6 @@ main(int argc, char *argv[]) > > } > > > > poll_block(); > > - if (should_service_stop()) { > > - exiting = true; > > - } > > } > > inc_proc_ic_cleanup(); > > > > @@ -4075,7 +4071,6 @@ main(int argc, char *argv[]) > > ovsdb_idl_loop_destroy(&ovninb_idl_loop); > > ovsdb_idl_loop_destroy(&ovnisb_idl_loop); > > ovsdb_idl_loop_destroy(&ovnisb_unlocked_idl_loop); > > - service_stop(); > > > > exit(res); > > } > > diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c > > index c3c198f2f..7a64a6ef2 100644 > > --- a/northd/ovn-northd.c > > +++ b/northd/ovn-northd.c > > @@ -835,7 +835,6 @@ main(int argc, char *argv[]) > > fatal_ignore_sigpipe(); > > ovs_cmdl_proctitle_init(argc, argv); > > ovn_set_program_name(argv[0]); > > - service_start(&argc, &argv); > > parse_options(argc, argv, &state.paused, &n_threads); > > > > daemonize_start(false, false); > > @@ -1217,9 +1216,6 @@ main(int argc, char *argv[]) > > > > stopwatch_stop(NORTHD_LOOP_STOPWATCH_NAME, time_msec()); > > poll_block(); > > - if (should_service_stop()) { > > - exit_args.exiting = true; > > - } > > stopwatch_start(NORTHD_LOOP_STOPWATCH_NAME, time_msec()); > > } > > inc_proc_northd_cleanup(); > > @@ -1228,7 +1224,6 @@ main(int argc, char *argv[]) > > ovsdb_idl_loop_destroy(&ovnsb_idl_loop); > > ovn_exit_args_finish(&exit_args); > > unixctl_server_destroy(unixctl); > > - service_stop(); > > run_update_worker_pool(0); > > ovsrcu_exit(); > > > > diff --git a/utilities/ovn-dbctl.c b/utilities/ovn-dbctl.c > > index 4a6e579f3..44aaad238 100644 > > --- a/utilities/ovn-dbctl.c > > +++ b/utilities/ovn-dbctl.c > > @@ -106,7 +106,7 @@ static char * OVS_WARN_UNUSED_RESULT main_loop( > > struct ctl_command *commands, size_t n_commands, > > struct ovsdb_idl *idl, const struct timer *); > > static void server_loop(const struct ovn_dbctl_options *dbctl_options, > > - struct ovsdb_idl *idl, int argc, char *argv[]); > > + struct ovsdb_idl *idl); > > static void ovn_dbctl_exit(int status); > > > > static void > > @@ -209,7 +209,7 @@ ovn_dbctl_main(int argc, char *argv[], > > set_idl_probe_interval(idl, db, DEFAULT_UTILS_PROBE_INTERVAL_MSEC); > > > > if (daemon_mode) { > > - server_loop(dbctl_options, idl, argc, argv_); > > + server_loop(dbctl_options, idl); > > } else { > > struct ctl_command *commands; > > size_t n_commands; > > @@ -1124,12 +1124,11 @@ update_inactivity_probe(struct server_cmd_run_ctx > > *ctx) > > > > static void > > server_loop(const struct ovn_dbctl_options *dbctl_options, > > - struct ovsdb_idl *idl, int argc, char *argv[]) > > + struct ovsdb_idl *idl) > > { > > struct unixctl_server *server = NULL; > > bool exiting = false; > > > > - service_start(&argc, &argv); > > daemonize_start(false, false); > > > > char *abs_unixctl_path = get_abs_unix_ctl_path(unixctl_path); > > diff --git a/utilities/ovn-trace.c b/utilities/ovn-trace.c > > index 46cc65fa0..c09a9041f 100644 > > --- a/utilities/ovn-trace.c > > +++ b/utilities/ovn-trace.c > > @@ -106,7 +106,6 @@ int > > main(int argc, char *argv[]) > > { > > ovn_set_program_name(argv[0]); > > - service_start(&argc, &argv); > > fatal_ignore_sigpipe(); > > vlog_set_levels_from_string_assert("reconnect:warn"); > > > > -- > > 2.54.0 > > > > _______________________________________________ > > dev mailing list > > [email protected] > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > _______________________________________________ > dev mailing list > [email protected] > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
_______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
