Merge ~zhhuabj/ubuntu/+source/neutron:yoga into ~ubuntu-openstack-dev/ubuntu/+source/neutron:stable/yoga

[Hua Zhang]

Unmerged commits

c99d388... by Hua Zhang on 2024-10-22

d/p/handle-creation-of-Port_Binding-with-chassis-set.patch (LP: #2017748)

diff --git a/debian/patches/handle-creation-of-Port_Binding-with-chassis-set.patch b/debian/patches/handle-creation-of-Port_Binding-with-chassis-set.patch
new file mode 100644
index 0000000..c6d6dc6
--- /dev/null
+++ b/debian/patches/handle-creation-of-Port_Binding-with-chassis-set.patch
@@ -0,0 +1,73 @@
+From 952e960414e7c15d4d4351bf2300ce53a69e4051 Mon Sep 17 00:00:00 2001
+From: Terry Wilson <[e-mail]>
+Date: Tue, 20 Aug 2024 10:20:52 -0500
+Subject: [PATCH] Handle creation of Port_Binding with chassis set
+
+When there is a backlog of notifications to be sent, it is possible
+that ovsdb-server will merge insert and update notifications. Due
+to this, we need to handle the situation where we see a Port_Binding
+created with the chassis set.
+
+Closes-Bug: #2017748
+Change-Id: Idfae87cf6c60e9e18ede91ea20857cea5322738c
+---
+ neutron/agent/ovn/metadata/agent.py | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/neutron/agent/ovn/metadata/agent.py b/neutron/agent/ovn/metadata/agent.py
+index 54a8e54056..4bc8864773 100644
+--- a/neutron/agent/ovn/metadata/agent.py
++++ b/neutron/agent/ovn/metadata/agent.py
+@@ -106,14 +106,14 @@ class PortBindingChassisCreatedEvent(PortBindingChassisEvent):
+     LOG_MSG = "Port %s in datapath %s bound to our chassis"
+ 
+     def __init__(self, metadata_agent):
+-        events = (self.ROW_UPDATE,)
++        events = (self.ROW_CREATE, self.ROW_UPDATE,)
+         super(PortBindingChassisCreatedEvent, self).__init__(
+             metadata_agent, events)
+ 
+     def match_fn(self, event, row, old):
+         try:
+             return (row.chassis[0].name == self.agent.chassis and
+-                    not old.chassis)
++                    (event == self.ROW_CREATE or not old.chassis))
+         except (IndexError, AttributeError):
+             return False
+ 
+@@ -297,8 +297,9 @@ class MetadataAgent(object):
+             self.conf, self.chassis, sb_idl=self.sb_idl)
+         self._proxy.run()
+ 
+-        # Do the initial sync.
+-        self.sync()
++        # Do the initial sync. Provisioning handled by
++        # PortBindingChassisCreatedEvent on initial db dump
++        self.sync(provision=False)
+ 
+         # Register the agent with its corresponding Chassis
+         self.register_metadata_agent()
+@@ -349,7 +350,7 @@ class MetadataAgent(object):
+         return set(p.datapath for p in self._vif_ports(ports))
+ 
+     @_sync_lock
+-    def sync(self):
++    def sync(self, provision=True):
+         """Agent sync.
+ 
+         This function will make sure that all networks with ports in our
+@@ -379,8 +380,9 @@ class MetadataAgent(object):
+         # resync all network namespaces based on the associated datapaths,
+         # even those that are already running. This is to make sure
+         # everything within each namespace is up to date.
+-        for datapath in net_datapaths:
+-            self.provision_datapath(datapath)
++        if provision:
++            for datapath in net_datapaths:
++                self.provision_datapath(datapath)
+ 
+     @staticmethod
+     def _get_veth_name(datapath):
+-- 
+2.43.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 71779ba..ff5ca6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 skip-iptest.patch
+handle-creation-of-Port_Binding-with-chassis-set.patch