openstack/neutron
Code Issues Proposed changes

Merge "fix dhcp bulk reload exceptions"

Browse Source
This commit is contained in:
Zuul 2020-10-10 20:22:34 +00:00 committed by Gerrit Code Review
commit d656c8ebe2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/agent/dhcp/agent.py
View File

@ -165,10 +165,15 @@ class DhcpAgent(manager.Manager):
def _reload_bulk_allocations(self): def _reload_bulk_allocations(self):
while True: while True:
for network_id in self._network_bulk_allocations.keys(): # No need to lock access to _network_bulk_allocations because
# greenthreads multi-task co-operatively.
to_reload = self._network_bulk_allocations.keys()
self._network_bulk_allocations = {}
for network_id in to_reload:
network = self.cache.get_network_by_id(network_id) network = self.cache.get_network_by_id(network_id)
self.call_driver('bulk_reload_allocations', network) if network is not None:
del self._network_bulk_allocations[network_id] self.call_driver('bulk_reload_allocations', network)
eventlet.greenthread.sleep(self.conf.bulk_reload_interval) eventlet.greenthread.sleep(self.conf.bulk_reload_interval)
def call_driver(self, action, network, **action_kwargs): def call_driver(self, action, network, **action_kwargs):