]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Merge "Avoid ObjectDeletedError while accessing deleted binding"
authorJenkins <jenkins@review.openstack.org>
Tue, 3 Mar 2015 07:59:34 +0000 (07:59 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 3 Mar 2015 07:59:34 +0000 (07:59 +0000)
1  2 
neutron/db/agentschedulers_db.py

index 732f2d7f76e5df4436bb5872d606a87c02f43ccb,4cc645d852fb3264eaf1c72e8419b793399a5f5d..a9a879fe132ea4173ac02bd92c6a1ebe0d88674d
@@@ -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(