x/vmware-nsx
Code Issues Proposed changes

Merge "Fix race condition in ProcessMonitor"

Browse Source
This commit is contained in:
Jenkins 2014-12-13 05:13:36 +00:00 committed by Gerrit Code Review
commit 4b84f0401e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/agent/linux/external_process.py
View File

@ -220,7 +220,10 @@ class ProcessMonitor(object):
@lockutils.synchronized("_check_child_processes")
def _check_child_processes(self):
for service_id in self._process_managers:
# we build the list of keys before iterating in the loop to cover
# the case where other threads add or remove items from the
# dictionary which otherwise will cause a RuntimeError
for service_id in list(self._process_managers):
pm = self._process_managers.get(service_id)
if pm and not pm.active: