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.

Sign up for GitHub

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

🐛 FIX: Cleanup process event hooks #200

Merged
merged 6 commits into from
Feb 2, 2021
Merged

🐛 FIX: Cleanup process event hooks #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6291835
🐛 FIX: Cleanup process event hooks
chrisjsewell Jan 28, 2021
1ccd44c
Update processes.py
chrisjsewell Jan 28, 2021
93425c6
Merge branch 'develop' into cleanup-event-hooks
chrisjsewell Jan 28, 2021
e0596e5
clear all event callbacks on close
chrisjsewell Jan 28, 2021
bfa4011
Merge branch 'cleanup-event-hooks' of https://github.com/aiidateam/pl…
chrisjsewell Jan 28, 2021
4d5f1a5
ignore callback removal is process already closed
chrisjsewell Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions plumpy/base/state_machine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ def add_state_event_callback(self, hook: Hashable, callback: EVENT_CALLBACK_TYPE
self._event_callbacks.setdefault(hook, []).append(callback)

def remove_state_event_callback(self, hook: Hashable, callback: EVENT_CALLBACK_TYPE) -> None:
if getattr(self, '_closed', False):
# if the process is closed, then all callbacks have already been removed
return None
try:
self._event_callbacks[hook].remove(callback)
except (KeyError, ValueError):
Expand Down
22 changes: 11 additions & 11 deletions plumpy/processes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,17 +317,16 @@ def try_killing(future: futures.Future) -> None:

def _setup_event_hooks(self) -> None:
"""Set the event hooks to process, when it is created or loaded(recreated)."""
self.add_state_event_callback(
state_machine.StateEventHook.ENTERING_STATE,
lambda _s, _h, state: self.on_entering(cast(process_states.State, state))
)
self.add_state_event_callback(
state_machine.StateEventHook.ENTERED_STATE,
lambda _s, _h, from_state: self.on_entered(cast(Optional[process_states.State], from_state))
)
self.add_state_event_callback(
state_machine.StateEventHook.EXITING_STATE, lambda _s, _h, _state: self.on_exiting()
)
event_hooks = {
state_machine.StateEventHook.ENTERING_STATE:
lambda _s, _h, state: self.on_entering(cast(process_states.State, state)),
state_machine.StateEventHook.ENTERED_STATE:
lambda _s, _h, from_state: self.on_entered(cast(Optional[process_states.State], from_state)),
state_machine.StateEventHook.EXITING_STATE:
lambda _s, _h, _state: self.on_exiting()
}
for hook, callback in event_hooks.items():
self.add_state_event_callback(hook, callback)

@property
def creation_time(self) -> Optional[float]:
Expand Down Expand Up @@ -845,6 +844,7 @@ def on_close(self) -> None:
self.logger.exception('Exception calling cleanup method %s', cleanup)
self._cleanups = None
finally:
self._event_callbacks = {}
self._closed = True

def _fire_event(self, evt: Callable[..., Any], *args: Any, **kwargs: Any) -> None:
Expand Down