From 2f7a2ae72b4b6584976f45b0cd4c9fe567db4926 Mon Sep 17 00:00:00 2001 From: Eugene Nikanorov Date: Sat, 19 Jul 2014 17:08:53 +0400 Subject: [PATCH] Move plugin.delete_port call out of transaction This might fix a few cases of lock wait timeouts. Change-Id: Iaa656a8582b2ff3ec55709bbe47b1ac9f5fc2a99 Closes-Bug: #1342166 --- neutron/db/loadbalancer/loadbalancer_db.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/db/loadbalancer/loadbalancer_db.py b/neutron/db/loadbalancer/loadbalancer_db.py index e81e0bd74..eb039d48f 100644 --- a/neutron/db/loadbalancer/loadbalancer_db.py +++ b/neutron/db/loadbalancer/loadbalancer_db.py @@ -460,8 +460,8 @@ class LoadBalancerPluginDb(loadbalancer.LoadBalancerPluginBase, pool.update({"vip_id": None}) context.session.delete(vip) - if vip.port: # this is a Neutron port - self._core_plugin.delete_port(context, vip.port.id) + if vip.port: # this is a Neutron port + self._core_plugin.delete_port(context, vip.port.id) def get_vip(self, context, id, fields=None): vip = self._get_resource(context, Vip, id) -- 2.45.2