| Message ID | 20230614091231.463313-1-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,branch-22.03] Revert "call ovsrcu_exit() before exit in ovn-northd and ovn-controller to make valgrind happy" | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | fail | github build: failed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 307d0fcd57..fbd7a780b1 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -4277,7 +4277,6 @@ loop_done: ovs_feature_support_destroy(); free(ovs_remote); service_stop(); - ovsrcu_exit(); exit(retval); } diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 731876cee8..4e18519fad 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -32,7 +32,6 @@ #include "lib/ovn-l7.h" #include "lib/ovn-nb-idl.h" #include "lib/ovn-sb-idl.h" -#include "lib/ovs-rcu.h" #include "openvswitch/poll-loop.h" #include "simap.h" #include "stopwatch.h" @@ -952,8 +951,6 @@ main(int argc, char *argv[]) ovsdb_idl_loop_destroy(&ovnnb_idl_loop); ovsdb_idl_loop_destroy(&ovnsb_idl_loop); service_stop(); - run_update_worker_pool(0); - ovsrcu_exit(); exit(res); }
This reverts commit 6849811833b5a40137288145dc2c3e4ac22f90fd. The function run_update_worker_pool() doesn't exist on branches <= 22.03 as the parallelization code changed in newer branches. There's no need to complicate things just to make valgrind happy. Fixes: 6849811833b5 ("call ovsrcu_exit() before exit in ovn-northd and ovn-controller to make valgrind happy") Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- controller/ovn-controller.c | 1 - northd/ovn-northd.c | 3 --- 2 files changed, 4 deletions(-)