[ovs-dev] [PATCH ovn v4 0/2] controller-vtep: Fix MMR creation and commit only changed data

Vladislav Odintsov odivlad at gmail.com
Tue Jun 15 18:41:11 UTC 2021


I’m sorry for the broken tests, for some reason I sent wrong revision of them.
Thanks you for fixing them.

One of the patches is a bugfix, another one is a small optimisation. I know you
backport only fixes without new behaviour. I’m okay with this, but if you can
backport both, it would be less manual work later for us to make backport in
our fork. :)

Actually I was going to send backport down to stable branches (21.06->20.03).
These patches should cleanly apply on all the branches, let me know if I have to
send backports or you can do it by yourself.


Regards,
Vladislav Odintsov

> On 15 Jun 2021, at 21:00, Numan Siddique <numans at ovn.org> wrote:
> 
> On Tue, Jun 15, 2021 at 12:27 PM Vladislav Odintsov <odivlad at gmail.com <mailto:odivlad at gmail.com>> wrote:
>> 
>> This series fixes duplicated MMR records in VTEP Database, which
>> previously was created for each port binding.
>> Also, now VTEP Logical_Switch's tunnel_key and replication_mode
>> are committed only if needed.
> 
> Thanks Vladislav for the fixes and Dumitru for the reviews.
> The below test case is failing due to the wrong usage of check.
> I fixed it and applied both patches to the master.
> 
> ----------------
> /home/runner/work/ovn/ovn/ovn-21.06.0/_build/sub/tests/testsuite.dir/at-groups/944/test-source:
> line 336: syntax error near unexpected token `ovn-nbctl'
> 5404/home/runner/work/ovn/ovn/ovn-21.06.0/_build/sub/tests/testsuite.dir/at-groups/944/test-source:
> line 336: `check(ovn-nbctl lsp-add br-test vif0)'
> 5405testsuite: WARNING: unable to parse test group: 944
> 5406944: ovn-controller-vtep - vtep-Mcast_Macs_Remote testsuite:
> WARNING: A failure happened in a test group before any test could be
> 5407testsuite: WARNING: run. This means that test suite is improperly
> designed. Please
> 5408testsuite: WARNING: report this failure to <bugs at openvswitch.org <mailto:bugs at openvswitch.org>>.
> 5409 FAILED (ovn-controller-vtep.at:511 <http://ovn-controller-vtep.at:511/>)
> --------
> 
> Let me know if it requires backports ?
> 
> Below are the changes I did
> 
> ****
> diff --git a/tests/ovn-controller-vtep.at <http://ovn-controller-vtep.at/> b/tests/ovn-controller-vtep.at <http://ovn-controller-vtep.at/>
> index 54db62f608..b0ddfb3e6e 100644
> --- a/tests/ovn-controller-vtep.at <http://ovn-controller-vtep.at/>
> +++ b/tests/ovn-controller-vtep.at <http://ovn-controller-vtep.at/>
> @@ -513,15 +513,15 @@ OVN_CONTROLLER_VTEP_START
> 
> # creates a simple logical network with the vtep device and a fake hv chassis
> # 'ch0'.
> -check(ovn-nbctl lsp-add br-test vif0)
> -check(ovn-nbctl lsp-set-addresses vif0 f0:ab:cd:ef:01:00)
> -check(ovn-nbctl --wait=sb sync)
> -check(ovn-sbctl chassis-add ch0 vxlan 1.2.3.5)
> -check(ovn-sbctl lsp-bind vif0 ch0)
> +check ovn-nbctl lsp-add br-test vif0
> +check ovn-nbctl lsp-set-addresses vif0 f0:ab:cd:ef:01:00
> +check ovn-nbctl --wait=sb sync
> +check ovn-sbctl chassis-add ch0 vxlan 1.2.3.5
> +check ovn-sbctl lsp-bind vif0 ch0
> 
> # creates the logical switch in vtep and adds the corresponding logical
> # port to 'br-test'.
> -check(vtep-ctl add-ls lswitch0 -- bind-ls br-vtep p0 100 lswitch0)
> +check vtep-ctl add-ls lswitch0 -- bind-ls br-vtep p0 100 lswitch0
> OVN_NB_ADD_VTEP_PORT([br-test], [br-vtep_lswitch0], [br-vtep], [lswitch0])
> OVS_WAIT_UNTIL([test -n "`ovn-sbctl list Port_Binding  | grep
> br-vtep_lswitch0`"])
> 
> @@ -540,11 +540,11 @@ done], [0], [dnl
> ])
> 
> # add new lport and bind it to another fake chassis 'ch1'.
> -check(ovn-nbctl lsp-add br-test vif1])
> -check(ovn-nbctl lsp-set-addresses vif0 f0:ab:cd:ef:01:01])
> -check(ovn-nbctl --wait=sb sync])
> -check(ovn-sbctl chassis-add ch1 vxlan 1.2.3.6])
> -check(ovn-sbctl lsp-bind vif1 ch1])
> +check ovn-nbctl lsp-add br-test vif1
> +check ovn-nbctl lsp-set-addresses vif0 f0:ab:cd:ef:01:01
> +check ovn-nbctl --wait=sb sync
> +check ovn-sbctl chassis-add ch1 vxlan 1.2.3.6
> +check ovn-sbctl lsp-bind vif1 ch1
> 
> # checks there is still only one Mcast_Macs_Remote record.
> OVS_WAIT_UNTIL([test `vtep-ctl list Mcast_Macs_Remote | grep _uuid |
> wc -l` -eq 1])
> 
> *****
> 
> 
> Thanks
> Numan
> 
>> 
>> v3 -> v4
>> ----
>>  * Deleted form feedes returned back.
>> 
>> v2 -> v3
>> ----
>>  * Addressed review comments from Dumitru and Ben.
>>  * Split optimization code to separate patch.
>> 
>> v1 -> v2
>> ----
>>  * Fixed formatting.
>> 
>> Vladislav Odintsov (2):
>>  controller-vtep: fix mmr and physical locators create/update
>>  ovn-controller-vtep: update tunnel_key and replication_mode only if
>>    needed
>> 
>> controller-vtep/vtep.c       | 73 ++++++++++++++++++++++--------------
>> tests/ovn-controller-vtep.at | 70 ++++++++++++++++++++++++++++++++++
>> 2 files changed, 114 insertions(+), 29 deletions(-)
>> 
>> --
>> 2.30.0
>> 
>> _______________________________________________
>> dev mailing list
>> dev at openvswitch.org <mailto:dev at openvswitch.org>
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>
>> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org <mailto:dev at openvswitch.org>
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>


More information about the dev mailing list