From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 3 Mar 2015 07:59:34 +0000 (+0000)
Subject: Merge "Avoid ObjectDeletedError while accessing deleted binding"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=701f29853169c3a1a2edeb67d291305f0e4a9fa4;p=openstack-build%2Fneutron-build.git

Merge "Avoid ObjectDeletedError while accessing deleted binding"
---

701f29853169c3a1a2edeb67d291305f0e4a9fa4
diff --cc neutron/db/agentschedulers_db.py
index 732f2d7f7,4cc645d85..a9a879fe1
--- a/neutron/db/agentschedulers_db.py
+++ b/neutron/db/agentschedulers_db.py
@@@ -267,15 -271,13 +271,13 @@@ class DhcpAgentSchedulerDbMixin(dhcpage
                  # measures against concurrent operation
                  LOG.debug("Network %(net)s already removed from DHCP agent "
                            "%(agent)s",
-                           {'net': binding.network_id,
-                            'agent': binding.dhcp_agent_id})
+                           saved_binding)
                  # still continue and allow concurrent scheduling attempt
              except Exception:
 -                LOG.exception(_LE("Unexpected exception occured while "
 +                LOG.exception(_LE("Unexpected exception occurred while "
                                    "removing network %(net)s from agent "
                                    "%(agent)s"),
-                               {'net': binding.network_id,
-                                'agent': binding.dhcp_agent_id})
+                               saved_binding)
  
              if cfg.CONF.network_auto_schedule:
                  self._schedule_network(