Merge ~fnordahl/ubuntu/+source/ovn:ubuntu/focal into ~ubuntu-server-dev/ubuntu/+source/ovn:ubuntu/focal

[Frode Nordahl]

diff --git a/debian/changelog b/debian/changelog
index 600b58d..a3fa1ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ovn (20.03.1-0ubuntu1.1) focal; urgency=medium
+
+  * d/p: ovn-controller-ofctrl-probe-interval.patch (LP: #1899369).
+
+ -- Frode Nordahl <[e-mail]>  Fri, 06 Nov 2020 08:21:03 +0000
+
 ovn (20.03.1-0ubuntu1) focal; urgency=medium
 
   * New upstream point release (LP: #1897248).
diff --git a/debian/patches/ovn-controller-ofctrl-probe-interval.patch b/debian/patches/ovn-controller-ofctrl-probe-interval.patch
 new file mode 100644
index 0000000..bf14b32
--- /dev/null
+++ b/debian/patches/ovn-controller-ofctrl-probe-interval.patch
@@ -0,0 +1,40 @@
+Description: Cherry-pick not yet tagged upstream backport to branch-20.03
+Origin: https://github.com/ovn-org/ovn/commit/028d6db38ff56018ba40b3abb3da94ba7a724ffa
+Applied-Upstream: commit: 028d6db38ff56018ba40b3abb3da94ba7a724ffa
+
+From 028d6db38ff56018ba40b3abb3da94ba7a724ffa Mon Sep 17 00:00:00 2001
+From: Han Zhou <[e-mail]>
+Date: Mon, 24 Aug 2020 18:48:06 -0700
+Subject: [PATCH] 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 <[e-mail]>
+Acked-by: Mark Michelson <[e-mail]>
+Signed-off-by: Han Zhou <[e-mail]>
+---
+ controller/ovn-controller.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c
+index 4d21ba0fd..53b70e500 100644
+--- a/controller/ovn-controller.c
++++ b/controller/ovn-controller.c
+@@ -76,7 +76,7 @@ static unixctl_cb_func engine_recompute_cmd;
+ 
+ #define DEFAULT_BRIDGE_NAME "br-int"
+ #define DEFAULT_PROBE_INTERVAL_MSEC 5000
+-#define OFCTRL_DEFAULT_PROBE_INTERVAL_SEC 5
++#define OFCTRL_DEFAULT_PROBE_INTERVAL_SEC 0
+ 
+ #define CONTROLLER_LOOP_STOPWATCH_NAME "ovn-controller-flow-generation"
+ 
diff --git a/debian/patches/series b/debian/patches/series
 new file mode 100644
index 0000000..d55d9eb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ovn-controller-ofctrl-probe-interval.patch