diff mbox series

[ovs-dev] tests: Set inactivity_probe for ovn-remote.

Message ID 20250317174149.4429-1-fnordahl@ubuntu.com
State Accepted
Headers show
Series [ovs-dev] tests: Set inactivity_probe for ovn-remote. | expand

Checks

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
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes fail github build: failed

Commit Message

Frode Nordahl March 17, 2025, 5:41 p.m. UTC
Common macros set up a SSL or TCP connection for communication
between ovn-controller and SB DB in the test environment.

This connection is subject to the default inactivity_probe value
of 5000ms.

On slow systems, this may not be enough.  Consequently set the
inactivity_probe to 15000ms on both ends of the connection.

Reported-at: https://launchpad.net/bugs/2103444
Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
---
 tests/ovn-macros.at | 3 +++
 1 file changed, 3 insertions(+)

Comments

Dumitru Ceara March 20, 2025, 3:59 p.m. UTC | #1
On 3/17/25 6:41 PM, Frode Nordahl wrote:
> Common macros set up a SSL or TCP connection for communication
> between ovn-controller and SB DB in the test environment.
> 
> This connection is subject to the default inactivity_probe value
> of 5000ms.
> 
> On slow systems, this may not be enough.  Consequently set the
> inactivity_probe to 15000ms on both ends of the connection.
> 
> Reported-at: https://launchpad.net/bugs/2103444
> Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
> ---

Recheck-request: github-robot
Dumitru Ceara March 20, 2025, 4 p.m. UTC | #2
On 3/20/25 4:59 PM, Dumitru Ceara wrote:
> On 3/17/25 6:41 PM, Frode Nordahl wrote:
>> Common macros set up a SSL or TCP connection for communication
>> between ovn-controller and SB DB in the test environment.
>>
>> This connection is subject to the default inactivity_probe value
>> of 5000ms.
>>
>> On slow systems, this may not be enough.  Consequently set the
>> inactivity_probe to 15000ms on both ends of the connection.
>>
>> Reported-at: https://launchpad.net/bugs/2103444
>> Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
>> ---
> 
> Recheck-request: github-robot
> 

Recheck-request: github-robot-_Build_and_Test
Mark Michelson April 9, 2025, 4:58 p.m. UTC | #3
Thanks, Frode,

Acked-by: Mark Michelson <mmichels@redhat.com>

On 3/17/25 13:41, Frode Nordahl wrote:
> Common macros set up a SSL or TCP connection for communication
> between ovn-controller and SB DB in the test environment.
> 
> This connection is subject to the default inactivity_probe value
> of 5000ms.
> 
> On slow systems, this may not be enough.  Consequently set the
> inactivity_probe to 15000ms on both ends of the connection.
> 
> Reported-at: https://launchpad.net/bugs/2103444
> Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
> ---
>   tests/ovn-macros.at | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
> index 1ef511c25..573353e3d 100644
> --- a/tests/ovn-macros.at
> +++ b/tests/ovn-macros.at
> @@ -613,12 +613,14 @@ ovn_start () {
>           ovn-sbctl \
>               -- --id=@c create connection \
>                   target=\"ptcp:0:127.0.0.1\" \
> +                inactivity_probe=15000 \
>               -- add SB_Global . connections @c
>       elif test X$HAVE_OPENSSL = Xyes; then
>           # Create the SB DB pssl+RBAC connection.
>           ovn-sbctl \
>               -- --id=@c create connection \
>                   target=\"pssl:0:127.0.0.1\" role=ovn-controller \
> +                inactivity_probe=15000 \
>               -- add SB_Global . connections @c
>           local d=$ovs_base
>           if test -n "$AZ"; then
> @@ -743,6 +745,7 @@ ovn_az_attach() {
>           -- set Open_vSwitch . external-ids:hostname=$sandbox \
>           -- set Open_vSwitch . external-ids:system-id=$systemid \
>           -- set Open_vSwitch . external-ids:ovn-remote=$ovn_remote \
> +        -- set Open_vSwitch . external-ids:ovn-remote-probe-interval=15000 \
>           -- set Open_vSwitch . external-ids:ovn-encap-type=$encap \
>           -- set Open_vSwitch . external-ids:ovn-encap-ip=$ip \
>           -- --may-exist add-br br-int \
Numan Siddique April 30, 2025, 3:37 p.m. UTC | #4
On Wed, Apr 9, 2025 at 12:58 PM Mark Michelson via dev
<ovs-dev@openvswitch.org> wrote:
>
> Thanks, Frode,
>
> Acked-by: Mark Michelson <mmichels@redhat.com>

Thanks.

Applied to main.

Numan

>
> On 3/17/25 13:41, Frode Nordahl wrote:
> > Common macros set up a SSL or TCP connection for communication
> > between ovn-controller and SB DB in the test environment.
> >
> > This connection is subject to the default inactivity_probe value
> > of 5000ms.
> >
> > On slow systems, this may not be enough.  Consequently set the
> > inactivity_probe to 15000ms on both ends of the connection.
> >
> > Reported-at: https://launchpad.net/bugs/2103444
> > Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
> > ---
> >   tests/ovn-macros.at | 3 +++
> >   1 file changed, 3 insertions(+)
> >
> > diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
> > index 1ef511c25..573353e3d 100644
> > --- a/tests/ovn-macros.at
> > +++ b/tests/ovn-macros.at
> > @@ -613,12 +613,14 @@ ovn_start () {
> >           ovn-sbctl \
> >               -- --id=@c create connection \
> >                   target=\"ptcp:0:127.0.0.1\" \
> > +                inactivity_probe=15000 \
> >               -- add SB_Global . connections @c
> >       elif test X$HAVE_OPENSSL = Xyes; then
> >           # Create the SB DB pssl+RBAC connection.
> >           ovn-sbctl \
> >               -- --id=@c create connection \
> >                   target=\"pssl:0:127.0.0.1\" role=ovn-controller \
> > +                inactivity_probe=15000 \
> >               -- add SB_Global . connections @c
> >           local d=$ovs_base
> >           if test -n "$AZ"; then
> > @@ -743,6 +745,7 @@ ovn_az_attach() {
> >           -- set Open_vSwitch . external-ids:hostname=$sandbox \
> >           -- set Open_vSwitch . external-ids:system-id=$systemid \
> >           -- set Open_vSwitch . external-ids:ovn-remote=$ovn_remote \
> > +        -- set Open_vSwitch . external-ids:ovn-remote-probe-interval=15000 \
> >           -- set Open_vSwitch . external-ids:ovn-encap-type=$encap \
> >           -- set Open_vSwitch . external-ids:ovn-encap-ip=$ip \
> >           -- --may-exist add-br br-int \
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Dumitru Ceara May 1, 2025, 8:40 p.m. UTC | #5
On 4/30/25 5:37 PM, Numan Siddique wrote:
> On Wed, Apr 9, 2025 at 12:58 PM Mark Michelson via dev
> <ovs-dev@openvswitch.org> wrote:
>>
>> Thanks, Frode,
>>
>> Acked-by: Mark Michelson <mmichels@redhat.com>
> 
> Thanks.
> 
> Applied to main.
> 
> Numan
> 

Hi Numan, Mark, Frode,

Sorry, I should've probably mentioned this explicitly on the patch but
this uncovers some other underlying issue (didn't debug further yet) and
causes one of our tests to fail often in CI:

https://github.com/ovn-org/ovn/actions/runs/14758505553/job/41433037753#step:10:5297

Also briefly discussed during the IRC meeting on April 3rd:
https://libera.irclog.whitequark.org/openvswitch/2025-04-03#37982200;

I wonder if we should revert 27c0dc6b7b22 ("tests: Set inactivity_probe
for ovn-remote.") until we figure out the problem with the flaky test.

What do you guys think?

Regards,
Dumitru

>>
>> On 3/17/25 13:41, Frode Nordahl wrote:
>>> Common macros set up a SSL or TCP connection for communication
>>> between ovn-controller and SB DB in the test environment.
>>>
>>> This connection is subject to the default inactivity_probe value
>>> of 5000ms.
>>>
>>> On slow systems, this may not be enough.  Consequently set the
>>> inactivity_probe to 15000ms on both ends of the connection.
>>>
>>> Reported-at: https://launchpad.net/bugs/2103444
>>> Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
>>> ---
>>>   tests/ovn-macros.at | 3 +++
>>>   1 file changed, 3 insertions(+)
>>>
>>> diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
>>> index 1ef511c25..573353e3d 100644
>>> --- a/tests/ovn-macros.at
>>> +++ b/tests/ovn-macros.at
>>> @@ -613,12 +613,14 @@ ovn_start () {
>>>           ovn-sbctl \
>>>               -- --id=@c create connection \
>>>                   target=\"ptcp:0:127.0.0.1\" \
>>> +                inactivity_probe=15000 \
>>>               -- add SB_Global . connections @c
>>>       elif test X$HAVE_OPENSSL = Xyes; then
>>>           # Create the SB DB pssl+RBAC connection.
>>>           ovn-sbctl \
>>>               -- --id=@c create connection \
>>>                   target=\"pssl:0:127.0.0.1\" role=ovn-controller \
>>> +                inactivity_probe=15000 \
>>>               -- add SB_Global . connections @c
>>>           local d=$ovs_base
>>>           if test -n "$AZ"; then
>>> @@ -743,6 +745,7 @@ ovn_az_attach() {
>>>           -- set Open_vSwitch . external-ids:hostname=$sandbox \
>>>           -- set Open_vSwitch . external-ids:system-id=$systemid \
>>>           -- set Open_vSwitch . external-ids:ovn-remote=$ovn_remote \
>>> +        -- set Open_vSwitch . external-ids:ovn-remote-probe-interval=15000 \
>>>           -- set Open_vSwitch . external-ids:ovn-encap-type=$encap \
>>>           -- set Open_vSwitch . external-ids:ovn-encap-ip=$ip \
>>>           -- --may-exist add-br br-int \
>>
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Numan Siddique May 1, 2025, 11:44 p.m. UTC | #6
On Thu, May 1, 2025 at 4:41 PM Dumitru Ceara <dceara@redhat.com> wrote:
>
> On 4/30/25 5:37 PM, Numan Siddique wrote:
> > On Wed, Apr 9, 2025 at 12:58 PM Mark Michelson via dev
> > <ovs-dev@openvswitch.org> wrote:
> >>
> >> Thanks, Frode,
> >>
> >> Acked-by: Mark Michelson <mmichels@redhat.com>
> >
> > Thanks.
> >
> > Applied to main.
> >
> > Numan
> >
>
> Hi Numan, Mark, Frode,
>
> Sorry, I should've probably mentioned this explicitly on the patch but
> this uncovers some other underlying issue (didn't debug further yet) and
> causes one of our tests to fail often in CI:
>
> https://github.com/ovn-org/ovn/actions/runs/14758505553/job/41433037753#step:10:5297
>
> Also briefly discussed during the IRC meeting on April 3rd:
> https://libera.irclog.whitequark.org/openvswitch/2025-04-03#37982200;
>
> I wonder if we should revert 27c0dc6b7b22 ("tests: Set inactivity_probe
> for ovn-remote.") until we figure out the problem with the flaky test.
>
> What do you guys think?

I tried to debug the issue, but couldn't reproduce it locally when
running the test in a loop.
From the CI logs,  it looks like the appctl command to exit
ovn-controller  timed out.

ovs-appctl --timeout=10 -t ovn-controller exit

I'm just confused why increasing the probe interval is causing this  issue.
Since the probe interval is now 15 seconds,  is the IDL blocking for
some reason and that's ovs-appctl times out ?

After this commit "2a12cda890a" (controller, northd: Wait for cleanup
before replying to exit),  we wait for the cleanup
to finish before exiting.   Looks like either IDL or the cleanup is
taking more than 10 seconds and that's ovs-appctl exit times out.

I'm fine reverting this patch.  But should we also debug if there is a
bug in ovn-controller during exit ?

Thanks
Numan

>
> Regards,
> Dumitru
>
> >>
> >> On 3/17/25 13:41, Frode Nordahl wrote:
> >>> Common macros set up a SSL or TCP connection for communication
> >>> between ovn-controller and SB DB in the test environment.
> >>>
> >>> This connection is subject to the default inactivity_probe value
> >>> of 5000ms.
> >>>
> >>> On slow systems, this may not be enough.  Consequently set the
> >>> inactivity_probe to 15000ms on both ends of the connection.
> >>>
> >>> Reported-at: https://launchpad.net/bugs/2103444
> >>> Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
> >>> ---
> >>>   tests/ovn-macros.at | 3 +++
> >>>   1 file changed, 3 insertions(+)
> >>>
> >>> diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
> >>> index 1ef511c25..573353e3d 100644
> >>> --- a/tests/ovn-macros.at
> >>> +++ b/tests/ovn-macros.at
> >>> @@ -613,12 +613,14 @@ ovn_start () {
> >>>           ovn-sbctl \
> >>>               -- --id=@c create connection \
> >>>                   target=\"ptcp:0:127.0.0.1\" \
> >>> +                inactivity_probe=15000 \
> >>>               -- add SB_Global . connections @c
> >>>       elif test X$HAVE_OPENSSL = Xyes; then
> >>>           # Create the SB DB pssl+RBAC connection.
> >>>           ovn-sbctl \
> >>>               -- --id=@c create connection \
> >>>                   target=\"pssl:0:127.0.0.1\" role=ovn-controller \
> >>> +                inactivity_probe=15000 \
> >>>               -- add SB_Global . connections @c
> >>>           local d=$ovs_base
> >>>           if test -n "$AZ"; then
> >>> @@ -743,6 +745,7 @@ ovn_az_attach() {
> >>>           -- set Open_vSwitch . external-ids:hostname=$sandbox \
> >>>           -- set Open_vSwitch . external-ids:system-id=$systemid \
> >>>           -- set Open_vSwitch . external-ids:ovn-remote=$ovn_remote \
> >>> +        -- set Open_vSwitch . external-ids:ovn-remote-probe-interval=15000 \
> >>>           -- set Open_vSwitch . external-ids:ovn-encap-type=$encap \
> >>>           -- set Open_vSwitch . external-ids:ovn-encap-ip=$ip \
> >>>           -- --may-exist add-br br-int \
> >>
> >> _______________________________________________
> >> dev mailing list
> >> dev@openvswitch.org
> >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Numan Siddique May 1, 2025, 11:59 p.m. UTC | #7
On Thu, May 1, 2025 at 7:44 PM Numan Siddique <numans@ovn.org> wrote:
>
> On Thu, May 1, 2025 at 4:41 PM Dumitru Ceara <dceara@redhat.com> wrote:
> >
> > On 4/30/25 5:37 PM, Numan Siddique wrote:
> > > On Wed, Apr 9, 2025 at 12:58 PM Mark Michelson via dev
> > > <ovs-dev@openvswitch.org> wrote:
> > >>
> > >> Thanks, Frode,
> > >>
> > >> Acked-by: Mark Michelson <mmichels@redhat.com>
> > >
> > > Thanks.
> > >
> > > Applied to main.
> > >
> > > Numan
> > >
> >
> > Hi Numan, Mark, Frode,
> >
> > Sorry, I should've probably mentioned this explicitly on the patch but
> > this uncovers some other underlying issue (didn't debug further yet) and
> > causes one of our tests to fail often in CI:
> >
> > https://github.com/ovn-org/ovn/actions/runs/14758505553/job/41433037753#step:10:5297
> >
> > Also briefly discussed during the IRC meeting on April 3rd:
> > https://libera.irclog.whitequark.org/openvswitch/2025-04-03#37982200;
> >
> > I wonder if we should revert 27c0dc6b7b22 ("tests: Set inactivity_probe
> > for ovn-remote.") until we figure out the problem with the flaky test.
> >
> > What do you guys think?
>
> I tried to debug the issue, but couldn't reproduce it locally when
> running the test in a loop.
> From the CI logs,  it looks like the appctl command to exit
> ovn-controller  timed out.
>
> ovs-appctl --timeout=10 -t ovn-controller exit
>
> I'm just confused why increasing the probe interval is causing this  issue.
> Since the probe interval is now 15 seconds,  is the IDL blocking for
> some reason and that's ovs-appctl times out ?
>
> After this commit "2a12cda890a" (controller, northd: Wait for cleanup
> before replying to exit),  we wait for the cleanup
> to finish before exiting.   Looks like either IDL or the cleanup is
> taking more than 10 seconds and that's ovs-appctl exit times out.
>
> I'm fine reverting this patch.  But should we also debug if there is a
> bug in ovn-controller during exit ?

I've submitted a patch to revert -
https://patchwork.ozlabs.org/project/ovn/patch/20250501235530.140417-1-numans@ovn.org/

Numan

>
> Thanks
> Numan
>
> >
> > Regards,
> > Dumitru
> >
> > >>
> > >> On 3/17/25 13:41, Frode Nordahl wrote:
> > >>> Common macros set up a SSL or TCP connection for communication
> > >>> between ovn-controller and SB DB in the test environment.
> > >>>
> > >>> This connection is subject to the default inactivity_probe value
> > >>> of 5000ms.
> > >>>
> > >>> On slow systems, this may not be enough.  Consequently set the
> > >>> inactivity_probe to 15000ms on both ends of the connection.
> > >>>
> > >>> Reported-at: https://launchpad.net/bugs/2103444
> > >>> Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
> > >>> ---
> > >>>   tests/ovn-macros.at | 3 +++
> > >>>   1 file changed, 3 insertions(+)
> > >>>
> > >>> diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
> > >>> index 1ef511c25..573353e3d 100644
> > >>> --- a/tests/ovn-macros.at
> > >>> +++ b/tests/ovn-macros.at
> > >>> @@ -613,12 +613,14 @@ ovn_start () {
> > >>>           ovn-sbctl \
> > >>>               -- --id=@c create connection \
> > >>>                   target=\"ptcp:0:127.0.0.1\" \
> > >>> +                inactivity_probe=15000 \
> > >>>               -- add SB_Global . connections @c
> > >>>       elif test X$HAVE_OPENSSL = Xyes; then
> > >>>           # Create the SB DB pssl+RBAC connection.
> > >>>           ovn-sbctl \
> > >>>               -- --id=@c create connection \
> > >>>                   target=\"pssl:0:127.0.0.1\" role=ovn-controller \
> > >>> +                inactivity_probe=15000 \
> > >>>               -- add SB_Global . connections @c
> > >>>           local d=$ovs_base
> > >>>           if test -n "$AZ"; then
> > >>> @@ -743,6 +745,7 @@ ovn_az_attach() {
> > >>>           -- set Open_vSwitch . external-ids:hostname=$sandbox \
> > >>>           -- set Open_vSwitch . external-ids:system-id=$systemid \
> > >>>           -- set Open_vSwitch . external-ids:ovn-remote=$ovn_remote \
> > >>> +        -- set Open_vSwitch . external-ids:ovn-remote-probe-interval=15000 \
> > >>>           -- set Open_vSwitch . external-ids:ovn-encap-type=$encap \
> > >>>           -- set Open_vSwitch . external-ids:ovn-encap-ip=$ip \
> > >>>           -- --may-exist add-br br-int \
> > >>
> > >> _______________________________________________
> > >> dev mailing list
> > >> dev@openvswitch.org
> > >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> > > _______________________________________________
> > > dev mailing list
> > > dev@openvswitch.org
> > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >
Frode Nordahl May 2, 2025, 7:09 a.m. UTC | #8
On 02.05.2025 01:59, Numan Siddique wrote:
> On Thu, May 1, 2025 at 7:44 PM Numan Siddique <numans@ovn.org> wrote:
>>
>> On Thu, May 1, 2025 at 4:41 PM Dumitru Ceara <dceara@redhat.com> wrote:
>>>
>>> On 4/30/25 5:37 PM, Numan Siddique wrote:
>>>> On Wed, Apr 9, 2025 at 12:58 PM Mark Michelson via dev
>>>> <ovs-dev@openvswitch.org> wrote:
>>>>>
>>>>> Thanks, Frode,
>>>>>
>>>>> Acked-by: Mark Michelson <mmichels@redhat.com>
>>>>
>>>> Thanks.
>>>>
>>>> Applied to main.
>>>>
>>>> Numan
>>>>
>>>
>>> Hi Numan, Mark, Frode,
>>>
>>> Sorry, I should've probably mentioned this explicitly on the patch but
>>> this uncovers some other underlying issue (didn't debug further yet) and
>>> causes one of our tests to fail often in CI:
>>>
>>> https://github.com/ovn-org/ovn/actions/runs/14758505553/job/41433037753#step:10:5297
>>>
>>> Also briefly discussed during the IRC meeting on April 3rd:
>>> https://libera.irclog.whitequark.org/openvswitch/2025-04-03#37982200;

Indeed we did, I never got around to looking further after that and probably should have updated the patch status on patchwork.

>>> I wonder if we should revert 27c0dc6b7b22 ("tests: Set inactivity_probe
>>> for ovn-remote.") until we figure out the problem with the flaky test.
>>>
>>> What do you guys think?
>>
>> I tried to debug the issue, but couldn't reproduce it locally when
>> running the test in a loop.
>>  From the CI logs,  it looks like the appctl command to exit
>> ovn-controller  timed out.
>>
>> ovs-appctl --timeout=10 -t ovn-controller exit
>>
>> I'm just confused why increasing the probe interval is causing this  issue.
>> Since the probe interval is now 15 seconds,  is the IDL blocking for
>> some reason and that's ovs-appctl times out ?
>>
>> After this commit "2a12cda890a" (controller, northd: Wait for cleanup
>> before replying to exit),  we wait for the cleanup
>> to finish before exiting.   Looks like either IDL or the cleanup is
>> taking more than 10 seconds and that's ovs-appctl exit times out.
>>
>> I'm fine reverting this patch.  But should we also debug if there is a
>> bug in ovn-controller during exit ?
> 
> I've submitted a patch to revert -
> https://patchwork.ozlabs.org/project/ovn/patch/20250501235530.140417-1-numans@ovn.org/

The last I looked at the one test that failed on the change ("ovn-controller - Chassis other_config"), it appeared to me that the test relies on some unsafe assumptions in the space of how the controller reacts to change of system-id and how RBAC rules are enforced.

Never got to the bottom of it though. I have another upstream issue to investigate this morning, so I'll try to have another look at this, and failing to find any resolution I'm happy to have it reverted until we do.

--
Frode Nordahl

> Numan
> 
>>
>> Thanks
>> Numan
>>
>>>
>>> Regards,
>>> Dumitru
>>>
>>>>>
>>>>> On 3/17/25 13:41, Frode Nordahl wrote:
>>>>>> Common macros set up a SSL or TCP connection for communication
>>>>>> between ovn-controller and SB DB in the test environment.
>>>>>>
>>>>>> This connection is subject to the default inactivity_probe value
>>>>>> of 5000ms.
>>>>>>
>>>>>> On slow systems, this may not be enough.  Consequently set the
>>>>>> inactivity_probe to 15000ms on both ends of the connection.
>>>>>>
>>>>>> Reported-at: https://launchpad.net/bugs/2103444
>>>>>> Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
>>>>>> ---
>>>>>>    tests/ovn-macros.at | 3 +++
>>>>>>    1 file changed, 3 insertions(+)
>>>>>>
>>>>>> diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
>>>>>> index 1ef511c25..573353e3d 100644
>>>>>> --- a/tests/ovn-macros.at
>>>>>> +++ b/tests/ovn-macros.at
>>>>>> @@ -613,12 +613,14 @@ ovn_start () {
>>>>>>            ovn-sbctl \
>>>>>>                -- --id=@c create connection \
>>>>>>                    target=\"ptcp:0:127.0.0.1\" \
>>>>>> +                inactivity_probe=15000 \
>>>>>>                -- add SB_Global . connections @c
>>>>>>        elif test X$HAVE_OPENSSL = Xyes; then
>>>>>>            # Create the SB DB pssl+RBAC connection.
>>>>>>            ovn-sbctl \
>>>>>>                -- --id=@c create connection \
>>>>>>                    target=\"pssl:0:127.0.0.1\" role=ovn-controller \
>>>>>> +                inactivity_probe=15000 \
>>>>>>                -- add SB_Global . connections @c
>>>>>>            local d=$ovs_base
>>>>>>            if test -n "$AZ"; then
>>>>>> @@ -743,6 +745,7 @@ ovn_az_attach() {
>>>>>>            -- set Open_vSwitch . external-ids:hostname=$sandbox \
>>>>>>            -- set Open_vSwitch . external-ids:system-id=$systemid \
>>>>>>            -- set Open_vSwitch . external-ids:ovn-remote=$ovn_remote \
>>>>>> +        -- set Open_vSwitch . external-ids:ovn-remote-probe-interval=15000 \
>>>>>>            -- set Open_vSwitch . external-ids:ovn-encap-type=$encap \
>>>>>>            -- set Open_vSwitch . external-ids:ovn-encap-ip=$ip \
>>>>>>            -- --may-exist add-br br-int \
>>>>>
>>>>> _______________________________________________
>>>>> dev mailing list
>>>>> dev@openvswitch.org
>>>>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>>>> _______________________________________________
>>>> dev mailing list
>>>> dev@openvswitch.org
>>>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>>>
diff mbox series

Patch

diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
index 1ef511c25..573353e3d 100644
--- a/tests/ovn-macros.at
+++ b/tests/ovn-macros.at
@@ -613,12 +613,14 @@  ovn_start () {
         ovn-sbctl \
             -- --id=@c create connection \
                 target=\"ptcp:0:127.0.0.1\" \
+                inactivity_probe=15000 \
             -- add SB_Global . connections @c
     elif test X$HAVE_OPENSSL = Xyes; then
         # Create the SB DB pssl+RBAC connection.
         ovn-sbctl \
             -- --id=@c create connection \
                 target=\"pssl:0:127.0.0.1\" role=ovn-controller \
+                inactivity_probe=15000 \
             -- add SB_Global . connections @c
         local d=$ovs_base
         if test -n "$AZ"; then
@@ -743,6 +745,7 @@  ovn_az_attach() {
         -- set Open_vSwitch . external-ids:hostname=$sandbox \
         -- set Open_vSwitch . external-ids:system-id=$systemid \
         -- set Open_vSwitch . external-ids:ovn-remote=$ovn_remote \
+        -- set Open_vSwitch . external-ids:ovn-remote-probe-interval=15000 \
         -- set Open_vSwitch . external-ids:ovn-encap-type=$encap \
         -- set Open_vSwitch . external-ids:ovn-encap-ip=$ip \
         -- --may-exist add-br br-int \