From df4e0a5394dff4cc176096abc64079d2c43fa9e7 Mon Sep 17 00:00:00 2001
From: LIU Yulong <liuyul@chinatelecom.cn>
Date: Thu, 21 Feb 2019 16:34:40 +0800
Subject: [PATCH] Change default local ovs connection timeout

Large number of flows can cause local ovs connection
timeout. Ultimately getting succeed will be better
than a retry or fullsync.

Related-Bug: #1813703
Related-Bug: #1813705
Related-Bug: #1813707
Related-Bug: #1813709

Change-Id: Ifa0608a7e131df3cad2f7727426720afce641a58
(cherry picked from commit 64ea642359e8f8aee2ebe494e037ecdfe8cf1b2c)
---
 neutron/conf/plugins/ml2/drivers/ovs_conf.py               | 4 ++--
 .../notes/change-of-default-timeout-b09d11683526e27d.yaml  | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/change-of-default-timeout-b09d11683526e27d.yaml

diff --git a/neutron/conf/plugins/ml2/drivers/ovs_conf.py b/neutron/conf/plugins/ml2/drivers/ovs_conf.py
index d6cbc775b6e..753efcedd3d 100644
--- a/neutron/conf/plugins/ml2/drivers/ovs_conf.py
+++ b/neutron/conf/plugins/ml2/drivers/ovs_conf.py
@@ -85,11 +85,11 @@ ovs_opts = [
     cfg.PortOpt('of_listen_port', default=6633,
                 help=_("Port to listen on for OpenFlow connections. "
                        "Used only for 'native' driver.")),
-    cfg.IntOpt('of_connect_timeout', default=30,
+    cfg.IntOpt('of_connect_timeout', default=300,
                help=_("Timeout in seconds to wait for "
                       "the local switch connecting the controller. "
                       "Used only for 'native' driver.")),
-    cfg.IntOpt('of_request_timeout', default=10,
+    cfg.IntOpt('of_request_timeout', default=300,
                help=_("Timeout in seconds to wait for a single "
                       "OpenFlow request. "
                       "Used only for 'native' driver.")),
diff --git a/releasenotes/notes/change-of-default-timeout-b09d11683526e27d.yaml b/releasenotes/notes/change-of-default-timeout-b09d11683526e27d.yaml
new file mode 100644
index 00000000000..81b23246741
--- /dev/null
+++ b/releasenotes/notes/change-of-default-timeout-b09d11683526e27d.yaml
@@ -0,0 +1,7 @@
+---
+other:
+  - |
+    In order to improve heavy load ovs agent restart success rate, instead
+    a retry or fullsync, the native driver ``of_connect_timeout`` and
+    ``of_request_timeout`` are now set to 300s. The value does not have side
+    effect for the regular pressure ovs agent.