Skip to content

Commit

Permalink
Revert "call ovsrcu_exit() before exit in ovn-northd and ovn-controll…
Browse files Browse the repository at this point in the history
…er to make valgrind happy"

This reverts commit 6849811.

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: 6849811 ("call ovsrcu_exit() before exit in ovn-northd and ovn-controller to make valgrind happy")
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
Acked-by: Igor Zhukov <fsb4000@yandex.ru>
  • Loading branch information
dceara committed Jun 14, 2023
1 parent 6849811 commit 60b32be
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion controller/ovn-controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -4277,7 +4277,6 @@ main(int argc, char *argv[])
ovs_feature_support_destroy();
free(ovs_remote);
service_stop();
ovsrcu_exit();

exit(retval);
}
Expand Down
3 changes: 0 additions & 3 deletions northd/ovn-northd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 60b32be

Please sign in to comment.