Commit 99b712b
committed
[stable-only][ovn] Fix ovsdbapp db_set command for stable branches
The lack of an if_exists on the db_set function in ovsdbapp causes the
network log object deletion to not be a asynchronous operation on the
ML2/OVN plugin. The if_exists was recently added to ovsdbapp, but since
that is an API change[0] it will not be backported to older branches,
so this patch overrides the function. This way we avoid the
possibility of getting errors when concurrently making operations
with security groups and network log objects.
Closes-bug: #2019887
[0] https://review.opendev.org/c/openstack/ovsdbapp/+/880687
Change-Id: I628591da75c1cc367076f5a3051ca3c1e131d216
(cherry picked from commit 551ba73)1 parent 46aefeb commit 99b712b
File tree
2 files changed
+42
-0
lines changed- neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb
2 files changed
+42
-0
lines changedLines changed: 34 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| |||
894 | 896 | | |
895 | 897 | | |
896 | 898 | | |
| 899 | + | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
| 905 | + | |
| 906 | + | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
| 928 | + | |
| 929 | + | |
| 930 | + | |
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
811 | 811 | | |
812 | 812 | | |
813 | 813 | | |
| 814 | + | |
| 815 | + | |
| 816 | + | |
| 817 | + | |
814 | 818 | | |
815 | 819 | | |
816 | 820 | | |
| |||
930 | 934 | | |
931 | 935 | | |
932 | 936 | | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
0 commit comments