From 212b03bd18be3dbe276008ac71db7228d5dd06d1 Mon Sep 17 00:00:00 2001
From: Numan Siddique <numan.siddique@gmail.com>
Date: Jun 23 2020 14:44:10 +0000
Subject: Backport "raft: Disable RAFT jsonrpc inactivity probe."


This patch is required for running OVN dbs in clustered mode.

Resolves: https://bugs.launchpad.net/kolla-ansible/+bug/1884734

Signed-off-by: Numan Siddique <nusiddiq@redhat.com>

---

diff --git a/0001-raft-Disable-RAFT-jsonrpc-inactivity-probe.patch b/0001-raft-Disable-RAFT-jsonrpc-inactivity-probe.patch
new file mode 100644
index 0000000..058b929
--- /dev/null
+++ b/0001-raft-Disable-RAFT-jsonrpc-inactivity-probe.patch
@@ -0,0 +1,33 @@
+From db5a066c17bdeaa7ecac08870331ae583f5ddfcc Mon Sep 17 00:00:00 2001
+From: Zhen Wang <zhewang@nvidia.com>
+Date: Mon, 30 Mar 2020 17:21:04 -0700
+Subject: [PATCH] raft: Disable RAFT jsonrpc inactivity probe.
+
+With the scale test of 640 nodes k8s cluster, raft DB nodes' jsonrpc
+session got closed due to the timeout of default 5 seconds probe.
+It will cause disturbance of the raft cluster. Since we already have
+the heartbeat for RAFT, just disable the probe between the servers
+to avoid the unnecessary jsonrpc inactivity probe.
+
+Acked-by: Han Zhou <hzhou@ovn.org>
+Signed-off-by: Zhen Wang <zhewang@nvidia.com>
+Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
+---
+ ovsdb/raft.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ovsdb/raft.c b/ovsdb/raft.c
+index e0af6bd62..18f29973e 100644
+--- a/ovsdb/raft.c
++++ b/ovsdb/raft.c
+@@ -938,6 +938,7 @@ raft_add_conn(struct raft *raft, struct jsonrpc_session *js,
+                                               &conn->sid);
+     conn->incoming = incoming;
+     conn->js_seqno = jsonrpc_session_get_seqno(conn->js);
++    jsonrpc_session_set_probe_interval(js, 0);
+ }
+ 
+ /* Starts the local server in an existing Raft cluster, using the local copy of
+-- 
+2.26.2
+
diff --git a/openvswitch.spec b/openvswitch.spec
index 512ae68..2bcfade 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -45,7 +45,7 @@ Name: openvswitch
 Summary: Open vSwitch daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.13.0
-Release: 2%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 3%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -65,6 +65,9 @@ Source: http://openvswitch.org/releases/%{name}-%{version}.tar.gz
 
 # OVS (including OVN) backports (0 - 300)
 
+# https://bugs.launchpad.net/kolla-ansible/+bug/1884734
+Patch0: 0001-raft-Disable-RAFT-jsonrpc-inactivity-probe.patch
+
 BuildRequires: gcc gcc-c++ make
 BuildRequires: autoconf automake libtool
 BuildRequires: systemd-units openssl openssl-devel
@@ -473,6 +476,9 @@ chown -R openvswitch:openvswitch /etc/openvswitch
 %endif
 
 %changelog
+* Tue Jun 23 2020 Numan Siddique <numan.sididque@gmail.com> - 2.13.0-3
+- Backport "raft: Disable RAFT jsonrpc inactivity probe." (launchpad bug: #1884734)
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.13.0-2
 - Rebuilt for Python 3.9