From 40254f7235a03ad28a4793a85aea96866f1fad7a Mon Sep 17 00:00:00 2001
From: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Date: Wed, 5 Oct 2022 21:35:48 +0200
Subject: [PATCH] [OVN] Set the default OVN metadata worker number to 0

If the configuration variable ``metadata_workers`` is not set,
the default value for ML2/OVN mechanism driver will be zero.
This value defines the number of separate workers that will
be spawned by the OVN metadata agent. By default, the OVN
metadata proxy handler will be executed inside the same OVN
metadata agent process, in a parallel thread. That reduces the
number of OVN SB database connections to one.

Related-Bug: #1993181
Change-Id: I8bc4f2784ccefe6078506bc27cc7a98c48192ad2
(cherry picked from commit 70a2029ca1309ef4a784d2f08f5b5f4bc69617a6)
---
 neutron/agent/ovn/metadata/server.py                     | 3 +--
 .../notes/ovn-metadata-workers-fa8a2019f34bd572.yaml     | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/ovn-metadata-workers-fa8a2019f34bd572.yaml

diff --git a/neutron/agent/ovn/metadata/server.py b/neutron/agent/ovn/metadata/server.py
index abd0c92fb5f..5942b5f6bc6 100644
--- a/neutron/agent/ovn/metadata/server.py
+++ b/neutron/agent/ovn/metadata/server.py
@@ -223,8 +223,7 @@ class UnixDomainMetadataProxy(object):
             'neutron-ovn-metadata-agent')
         # Set the default metadata_workers if not yet set in the config file
         md_workers = self.conf.metadata_workers
-        if md_workers is None:
-            md_workers = 2
+        md_workers = 0 if md_workers is None else md_workers
         sb_idl = self.sb_idl if md_workers == 0 else None
         self.server.start(MetadataProxyHandler(self.conf, self.chassis,
                                                sb_idl),
diff --git a/releasenotes/notes/ovn-metadata-workers-fa8a2019f34bd572.yaml b/releasenotes/notes/ovn-metadata-workers-fa8a2019f34bd572.yaml
new file mode 100644
index 00000000000..50516cb19e6
--- /dev/null
+++ b/releasenotes/notes/ovn-metadata-workers-fa8a2019f34bd572.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    The default value for the ``metadata_workers`` configuration option
+    has changed to 0 for the ML2/OVN driver. Since `[OVN] Allow to execute
+    "MetadataProxyHandler" in a local thread <https://review.opendev.org/c/openstack/neutron/+/861649>`_,
+    the OVN metadata proxy handler can be spawned in the same process of
+    the OVN metadata agent, in a local thread. That reduces the number of
+    OVN SB database connections to one.