[ovs-git] [ovn-org/ovn] 9a0db3: ovn-northd: By default don't enable probe for unix...

[Han Zhou]

  Branch: refs/heads/branch-20.06
  Home:   https://github.com/ovn-org/ovn
  Commit: 9a0db3cd614deefcbf5d693b5c76979e70dda043
      https://github.com/ovn-org/ovn/commit/9a0db3cd614deefcbf5d693b5c76979e70dda043
  Author: Han Zhou <hzhou at ovn.org>
  Date:   2020-08-25 (Tue, 25 Aug 2020)

  Changed paths:
    M northd/ovn-northd.c

  Log Message:
  -----------
  ovn-northd: By default don't enable probe for unix socket.

The commit ed09854e5b3 ("ovn-northd: Add the option to configure probe
interval") introduced the option northd-probe-interval to configure
ovn-northd probe interval with NB/SB DBs. However, it overrided the
default behavior that it used before - setting default probe interval
according to stream type. E.g., for unix socket, probe was disabled by default
but with the change it defaults to 5 seconds, if the option
northd-probe-interval is not set.

This patch restores the default behavior, while honoring the settings of
northd-probe-interval when it is configured.

Acked-by: Mark Michelson <mmichels at redhat.com>
Signed-off-by: Han Zhou <hzhou at ovn.org>


  Commit: 8cd56feadbc8644ece036784f78dd9be289c9fe9
      https://github.com/ovn-org/ovn/commit/8cd56feadbc8644ece036784f78dd9be289c9fe9
  Author: Han Zhou <hzhou at ovn.org>
  Date:   2020-08-25 (Tue, 25 Aug 2020)

  Changed paths:
    M controller/ovn-controller.c

  Log Message:
  -----------
  ovn-controller: Disable ofctrl probe by default.

The commit c99069c8934c ("ovn-controller: Provide the option to configure
inactivity probe interval for OpenFlow conn") supports configuring probe
interval for the openflow connection of ofctrl module. However, it changed the
default behavior. The default OpenFlow connection probe was defaults to 0
(disabled), because the connection is always unix socket (to local OVS br-int
bridge).  After that patch it changed to probe every 5 seconds, which was not
the intension.

This patch restores the default behavior of disabling the probe by setting
default value to 0, while keeping the capability of letting user configure it.

Cc: Numan Siddique <nusiddiq at redhat.com>
Acked-by: Mark Michelson <mmichels at redhat.com>
Signed-off-by: Han Zhou <hzhou at ovn.org>


Compare: https://github.com/ovn-org/ovn/compare/083c1d679937...8cd56feadbc8