Get rid of additional db contention on fetching VIP

This fix gets rid of fetching related record from ports table
that could potentially be blocked by concurrent operation
This is to prevent it from updating the
vip table while a port SQL lock is in place, which
vip entries have a reference to.

Partial-Bug: 1283522
Change-Id: Ic64cc268ff4817a31971734a44671c744047231b

diff --git a/neutron/db/loadbalancer/loadbalancer_db.py b/neutron/db/loadbalancer/loadbalancer_db.py
index cbff0ed0dbcc8af79e4bb0401e8c0bb4f8f9a471..06ec0723c3c62dc4e743efff28617ff02ec39614 100644 (file)
--- a/neutron/db/loadbalancer/loadbalancer_db.py
+++ b/neutron/db/loadbalancer/loadbalancer_db.py
@@ -192,7 +192,16 @@ class LoadBalancerPluginDb(LoadBalancerPluginBase,
     def update_status(self, context, model, id, status,
                       status_description=None):
         with context.session.begin(subtransactions=True):
-            v_db = self._get_resource(context, model, id)
+            if issubclass(model, Vip):
+                try:
+                    v_db = (self._model_query(context, model).
+                            filter(model.id == id).
+                            options(orm.noload('port')).
+                            one())
+                except exc.NoResultFound:
+                    raise loadbalancer.VipNotFound(vip_id=id)
+            else:
+                v_db = self._get_resource(context, model, id)
             if v_db.status != status:
                 v_db.status = status
             # update status_description in two cases: