0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 09:06:21 +01:00

SERVER-45250 Don't stop resmoke execution for failures due to crashes

This commit is contained in:
Carl Worley 2019-12-20 21:57:46 +00:00 committed by evergreen
parent 0e8ae6324e
commit 0e60cea67c
2 changed files with 5 additions and 7 deletions

View File

@ -200,7 +200,8 @@ class ShardedClusterFixture(interface.Fixture): # pylint: disable=too-many-inst
self.logger.warning("All members of the sharded cluster were expected to be running, "
"but weren't.")
if self.enable_balancer:
# If we're just killing, shutting down the balancer fails for nonresponsive servers.
if self.enable_balancer and not kill:
self.stop_balancer()
teardown_handler = interface.FixtureTeardownHandler(self.logger)

View File

@ -103,7 +103,8 @@ class HookTestArchival(object):
"""Trigger archive of data files for a test or hook."""
# We can still attempt archiving even if the teardown fails.
teardown_success = manager.teardown_fixture(logger, kill=True)
if not manager.teardown_fixture(logger, kill=True):
logger.warning("Error while killing test fixtures; data files may be invalid.")
with self._lock:
# Test repeat number is how many times the particular test has been archived.
if test_name not in self._tests_repeat:
@ -132,9 +133,5 @@ class HookTestArchival(object):
else:
logger.info("Archive succeeded for %s: %s", test_name, message)
setup_success = manager.setup_fixture(logger)
if not teardown_success:
raise errors.StopExecution(
"Error while killing test fixtures; data files may be invalid.")
if not setup_success:
if not manager.setup_fixture(logger):
raise errors.StopExecution("Error while restarting test fixtures after archiving.")