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

increase odin meta timeout to 30 #671

Merged
merged 8 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 2 additions & 1 deletion src/dodal/devices/eiger.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def set(self, value, *, timeout=None, settle_time=None, **kwargs):

STALE_PARAMS_TIMEOUT = 60
GENERAL_STATUS_TIMEOUT = 10
META_FILE_READY_TIMEOUT = 30
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Might be nice to have a comment here about file system issues requiring this

ALL_FRAMES_TIMEOUT = 120
ARMING_TIMEOUT = 60

Expand Down Expand Up @@ -305,7 +306,7 @@ def _wait_for_odin_status(self) -> StatusBase:
)
LOGGER.info("Eiger staging: awaiting odin metadata")
status &= await_value(
self.odin.meta.ready, 1, timeout=self.GENERAL_STATUS_TIMEOUT
self.odin.meta.ready, 1, timeout=self.META_FILE_READY_TIMEOUT
)
return status

Expand Down
2 changes: 1 addition & 1 deletion tests/common/beamlines/test_beamline_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_instantiating_different_device_with_same_name():
Smargon, "device", "", False, True, None
)
assert dev1.name == dev2.name
assert type(dev1) != type(dev2)
assert type(dev1) is not type(dev2)
assert dev1 not in beamline_utils.ACTIVE_DEVICES.values()
assert dev2 in beamline_utils.ACTIVE_DEVICES.values()

Expand Down
Loading