zuul/nodepool
Code Issues Proposed changes

Remove terminated image/instance delete threads

Browse Source 
When the separate image and instance delete threads were added
for periodic cleanup of leaked images and instances, the same
anti-duplication mechanism used for the periodic cleanup of nodes
was used: an dictionary of thread objects keyed by the object
being deleted.  However, the cleanup of those delete threads
was neglected, meaning that after those threads exited, if the
object persisted, nodepool would never try to delete it again.

This change adds the missing cleanup code.

Change-Id: Iac4049d265e23a7eae1b2917181de3c35fb6359d
This commit is contained in:
James E. Blair 2015-08-06 15:52:34 -07:00
parent 2cc9490901
commit 161792daa1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nodepool/nodepool.py
View File

@ -2353,6 +2353,14 @@ class NodePool(threading.Thread):
if not t.isAlive():
del self._delete_threads[k]
for k, t in self._image_delete_threads.items()[:]:
if not t.isAlive():
del self._image_delete_threads[k]
for k, t in self._instance_delete_threads.items()[:]:
if not t.isAlive():
del self._instance_delete_threads[k]
node_ids = []
image_ids = []
dib_image_ids = []