remote/coordinator: report exporter command timeouts

Convert exporter acquire/release command timeouts into ExporterError failures.
This returns a clear timeout reason to the client instead of relying on an empty TimeoutError message.

Signed-off-by: Alex Tercete <alex.tercete@arm.com>
Reviewed-by: Alex Tercete <alex.tercete@arm.com> # gatekeeper
Co-authored-by: Idan Saadon <idan.saadon@arm.com>

Author: 2 people

labgrid/remote/coordinator.py

@@ -655,7 +655,10 @@ async def _acquire_resource(self, place, resource):
         request.place_name = place.name
         cmd = ExporterCommand(request)
         self.get_exporter_by_name(resource.path[0]).queue.put_nowait(cmd)
-        await cmd.wait()
+        try:
+            await cmd.wait()
+        except asyncio.TimeoutError as e:
+            raise ExporterError("timed out waiting for exporter while acquiring resource") from e
         if not cmd.response.success:
             raise ExporterError(f"failed to acquire {resource} ({cmd.response.reason})")
         if resource.acquired != place.name:
@@ -727,13 +730,16 @@ async def _release_resources(self, place, resources, callback=True):
                     # request.place_name is left unset to indicate release
                     cmd = ExporterCommand(request)
                     self.get_exporter_by_name(resource.path[0]).queue.put_nowait(cmd)
-                    await cmd.wait()
+                    try:
+                        await cmd.wait()
+                    except asyncio.TimeoutError as e:
+                        raise ExporterError("timed out waiting for exporter while releasing resource") from e
                     if not cmd.response.success:
                         raise ExporterError(f"failed to release {resource} ({cmd.response.reason})")
                     if resource.acquired:
                         logging.warning("resource %s still acquired after release request", resource)
-            except (ExporterError, TimeoutError) as e:
-                if failure is None or isinstance(e, ExporterError):
+            except ExporterError as e:
+                if failure is None:
                     failure = e
                 logging.exception("failed to release %s", resource)
                 # at leaset try to notify the clients