Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.24.0 #307

Closed
wants to merge 11 commits into from
Next Next commit
Make Waiting.resume() idempotent (#285)
Calling `Waiting.resume()` when it had already been resumed would raise
an exception. Here, the method is made idempotent by checking first
whether the future has already been resolved. This fix ensures the
behavior matches the behavior of the other state transitions: calling
`play` on an already running process and calling `pause` on an already
paused process isn't rising any error.

(cherry picked from commit 20e5898)
sebaB003 authored Jun 24, 2024
commit d304110a0436fe94ab933777685399d4a19b84f9
4 changes: 4 additions & 0 deletions src/plumpy/process_states.py
Original file line number Diff line number Diff line change
@@ -330,6 +330,10 @@ async def execute(self) -> State: # type: ignore # pylint: disable=invalid-over

def resume(self, value: Any = NULL) -> None:
assert self._waiting_future is not None, 'Not yet waiting'

if self._waiting_future.done():
return

self._waiting_future.set_result(value)


11 changes: 5 additions & 6 deletions test/rmq/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -12,16 +12,15 @@
version: '3.4'

services:

rabbit:
image: rabbitmq:3.8.3-management
container_name: plumpy-rmq
image: rabbitmq:3-management-alpine
container_name: plumpy_rmq
ports:
- 5672:5672
- 15672:15672
environment:
RABBITMQ_DEFAULT_USER: guest
RABBITMQ_DEFAULT_PASS: guest
ports:
- '5672:5672'
- '15672:15672'
healthcheck:
test: rabbitmq-diagnostics -q ping
interval: 30s
25 changes: 25 additions & 0 deletions test/test_processes.py
Original file line number Diff line number Diff line change
@@ -836,6 +836,31 @@ async def async_test():
loop.create_task(proc.step_until_terminated())
loop.run_until_complete(async_test())

def test_double_restart(self):
"""Test that consecutive restarts do not cause any issues, this is tested for concurrency reasons."""
loop = asyncio.get_event_loop()
proc = _RestartProcess()

async def async_test():
await utils.run_until_waiting(proc)

# Save the state of the process
saved_state = plumpy.Bundle(proc)

# Load a process from the saved state
loaded_proc = saved_state.unbundle()
self.assertEqual(loaded_proc.state, ProcessState.WAITING)

# Now resume it twice in succession
loaded_proc.resume()
loaded_proc.resume()

await loaded_proc.step_until_terminated()
self.assertEqual(loaded_proc.outputs, {'finished': True})

loop.create_task(proc.step_until_terminated())
loop.run_until_complete(async_test())

def test_wait_save_continue(self):
""" Test that process saved while in WAITING state restarts correctly when loaded """
loop = asyncio.get_event_loop()