openstack/neutron-fwaas
Code Issues Proposed changes

Make plugin deallocation check optional

Browse Source 
The fix for memory leakage in the related bug added a check for plugin
deallocation that performed a call to gc.collect() after every test.
This had the side-effect of increasing test execution time by ~50%, so
this patch makes the check optional via an environment variable
(OS_CHECK_PLUGIN_DEALLOCATION).

It may make sense to create a periodic job that runs with the check
enabled, but otherwise the check can be used by developers for
debugging purposes.

Change-Id: I9ebe663abbc4e4ff3a62d807d5a3230c2ecccd07
Related-Bug: #1234857
This commit is contained in:
Maru Newby 2014-05-09 22:24:45 +00:00
parent 3133c7340e
commit ee5c3b0bb6
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
neutron/tests/base.py
View File

@ -69,13 +69,22 @@ class BaseTestCase(testtools.TestCase):
#TODO(marun) Fix plugins that do not properly initialize notifiers #TODO(marun) Fix plugins that do not properly initialize notifiers
agentschedulers_db.AgentSchedulerDbMixin.agent_notifiers = {} agentschedulers_db.AgentSchedulerDbMixin.agent_notifiers = {}
plugin = weakref.ref(nm._instance.plugin) # Perform a check for deallocation only if explicitly
nm.clear_instance() # configured to do so since calling gc.collect() after every
gc.collect() # test increases test suite execution time by ~50%.
check_plugin_deallocation = (
os.environ.get('OS_CHECK_PLUGIN_DEALLOCATION') in TRUE_STRING)
if check_plugin_deallocation:
plugin = weakref.ref(nm._instance.plugin)
#TODO(marun) Ensure that mocks are deallocated? nm.clear_instance()
if plugin() and not isinstance(plugin(), mock.Base):
self.fail('The plugin for this test was not deallocated.') if check_plugin_deallocation:
gc.collect()
#TODO(marun) Ensure that mocks are deallocated?
if plugin() and not isinstance(plugin(), mock.Base):
self.fail('The plugin for this test was not deallocated.')
def setup_coreplugin(self, core_plugin=None): def setup_coreplugin(self, core_plugin=None):
if core_plugin is not None: if core_plugin is not None: