提交: 3b5bf136f5798a4ea2c66875d6337ca3d6b79434 - qemu (git)

Commit MetaInfo

• 修訂: 3b5bf136f5798a4ea2c66875d6337ca3d6b79434 (tree)
• 時間: 2022-01-22 06:01:31
• 作者: John Snow <jsnow@redh...>
• Commiter: John Snow

Log Message

python/aqmp: handle asyncio.TimeoutError on execute()

This exception can be injected into any await statement. If we are
canceled via timeout, we want to clear the pending execution record on
our way out.

Signed-off-by: John Snow <[e-mail]>
Reviewed-by: Beraldo Leal <[e-mail]>
Reviewed-by: Vladimir Sementsov-Ogievskiy <[e-mail]>

Change Summary

• modified: python/qemu/aqmp/qmp_client.py

差異

--- a/python/qemu/aqmp/qmp_client.py
+++ b/python/qemu/aqmp/qmp_client.py
@@ -435,7 +435,11 @@ class QMPClient(AsyncProtocol[Message], Events):
             msg_id = msg['id']
 
         self._pending[msg_id] = asyncio.Queue(maxsize=1)
-        await self._outgoing.put(msg)
+        try:
+            await self._outgoing.put(msg)
+        except:
+            del self._pending[msg_id]
+            raise
 
         return msg_id
 
@@ -452,9 +456,9 @@ class QMPClient(AsyncProtocol[Message], Events):
             was lost, or some other problem.
         """
         queue = self._pending[msg_id]
-        result = await queue.get()
 
         try:
+            result = await queue.get()
             if isinstance(result, ExecInterruptedError):
                 raise result
             return result