opendev
/
gear
Code Issues Proposed changes

Guard against double shutdown in client 

If we have already performed a shutdown we can prevent exploding when
writing to self.wake_write if we short circuit.

Change-Id: If5352a373d5fa61dd1ee661f4a37976b3447dd9d
This commit is contained in:
Gregory Haynes 2016-01-26 20:14:20 +00:00
parent 5491e93d95
commit c313be6e18
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gear/__init__.py
View File

@ -1105,11 +1105,15 @@ class BaseClientServer(object):
The object may no longer be used after shutdown is called. The object may no longer be used after shutdown is called.
""" """
self.log.debug("Beginning shutdown") if self.running:
self._shutdown() self.log.debug("Beginning shutdown")
self.log.debug("Beginning cleanup") self._shutdown()
self._cleanup() self.log.debug("Beginning cleanup")
self.log.debug("Finished shutdown") self._cleanup()
self.log.debug("Finished shutdown")
else:
self.log.warning("Shutdown called when not currently running. "
"Ignoring.")
def _shutdown(self): def _shutdown(self):
# The first part of the shutdown process where all threads # The first part of the shutdown process where all threads

5
gear/tests/test_gear.py
View File

@ -287,6 +287,11 @@ class TestClient(tests.BaseTestCase):
acl.revokeGrant('manager') acl.revokeGrant('manager')
self.assertFalse(acl.canGrant('manager')) self.assertFalse(acl.canGrant('manager'))
def test_double_shutdown(self):
client = gear.Client()
client.shutdown()
client.shutdown()
def load_tests(loader, in_tests, pattern): def load_tests(loader, in_tests, pattern):
return testscenarios.load_tests_apply_scenarios(loader, in_tests, pattern) return testscenarios.load_tests_apply_scenarios(loader, in_tests, pattern)