Skip to content

Commit

Permalink
tests/availability: fix resuming of suspended nodes
Browse files Browse the repository at this point in the history
Resuming on test teardown is too late, doing it explicitly
  • Loading branch information
bashtanov committed Jul 29, 2024
1 parent 3cef311 commit 4180c73
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tests/rptest/services/failure_injector.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,11 @@ def _heal_all(self):
if spec.type != FailureSpec.FAILURE_ISOLATE
}

def _contunue_all(self):
def _continue_all(self):
self.redpanda.logger.info(f"continuing execution on all nodes")
for n in self.redpanda.nodes:
self._continue(n)
if self.redpanda.check_node(n):
self._continue(n)
self._in_flight = {
spec
for spec in self._in_flight
Expand Down
2 changes: 2 additions & 0 deletions tests/rptest/tests/availability_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,5 @@ def test_recovery_after_catastrophic_failure(self):
self.inject_failure(f_spec)

self.validate_records()

self._continue_all()
3 changes: 3 additions & 0 deletions tests/rptest/tests/e2e_finjector.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ def _failure_injector_loop(self):
f"waiting {delay} seconds before next failure")
time.sleep(delay)

def _continue_all(self):
make_failure_injector(self.redpanda)._continue_all()

def teardown(self):
self.enable_failures = False
if self.finjector_thread:
Expand Down

0 comments on commit 4180c73

Please sign in to comment.