From: Stephen Ma <stephen.ma@hp.com>
Date: Thu, 25 Jul 2013 14:25:48 +0000 (-0700)
Subject: Dhcp agent sync_state may block or delay
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3d5bec962c1e5bb923107f54585c94a9b24f2d30;p=openstack-build%2Fneutron-build.git

Dhcp agent sync_state may block or delay
configuration of new networks.

Fixes Bug 1202722

Change-Id: I368cb064057d48be1491df6825cc67c265706b50
---

diff --git a/neutron/agent/dhcp_agent.py b/neutron/agent/dhcp_agent.py
index 38582e166..08ccbe4b6 100644
--- a/neutron/agent/dhcp_agent.py
+++ b/neutron/agent/dhcp_agent.py
@@ -156,7 +156,12 @@ class DhcpAgent(manager.Manager):
             active_networks = self.plugin_rpc.get_active_networks_info()
             active_network_ids = set(network.id for network in active_networks)
             for deleted_id in known_network_ids - active_network_ids:
-                self.disable_dhcp_helper(deleted_id)
+                try:
+                    self.disable_dhcp_helper(deleted_id)
+                except Exception:
+                    self.needs_resync = True
+                    LOG.exception(_('Unable to sync network state on deleted '
+                                    'network %s') % deleted_id)
 
             for network in active_networks:
                 pool.spawn_n(self.configure_dhcp_for_network, network)