Verify that connections, transactions, and cursors are terminated when cancelled

Author: NoahStapp

pymongo/asynchronous/client_session.py

@@ -697,7 +697,7 @@ async def callback(session, custom_arg, custom_kwarg=None):
             )
             try:
                 ret = await callback(self)
-            except Exception as exc:
+            except BaseException as exc:
                 if self.in_transaction:
                     await self.abort_transaction()
                 if (

pymongo/asynchronous/cursor.py

@@ -1126,7 +1126,7 @@ async def _send_message(self, operation: Union[_Query, _GetMore]) -> None:
             self._killed = True
             await self.close()
             raise
-        except Exception:
+        except BaseException:
             await self.close()
             raise
 

pymongo/synchronous/client_session.py

@@ -694,7 +694,7 @@ def callback(session, custom_arg, custom_kwarg=None):
             self.start_transaction(read_concern, write_concern, read_preference, max_commit_time_ms)
             try:
                 ret = callback(self)
-            except Exception as exc:
+            except BaseException as exc:
                 if self.in_transaction:
                     self.abort_transaction()
                 if (

pymongo/synchronous/cursor.py

@@ -1124,7 +1124,7 @@ def _send_message(self, operation: Union[_Query, _GetMore]) -> None:
             self._killed = True
             self.close()
             raise
-        except Exception:
+        except BaseException:
             self.close()
             raise
 

test/asynchronous/test_async_cancellation.py

@@ -17,24 +17,24 @@
 
 import asyncio
 import sys
-import traceback
-
-from test.utils import async_get_pool, get_pool, one, delay
+from test.utils import async_get_pool, delay, one
 
 sys.path[0:0] = [""]
 
-from test.asynchronous import AsyncIntegrationTest, connected, async_client_context
+from test.asynchronous import AsyncIntegrationTest, async_client_context, connected
 
 
 class TestAsyncCancellation(AsyncIntegrationTest):
     async def test_async_cancellation_closes_connection(self):
-        client = await self.async_rs_or_single_client()
+        client = await self.async_rs_or_single_client(maxPoolSize=1)
         pool = await async_get_pool(client)
         await connected(client)
         conn = one(pool.conns)
+        await client.db.test.insert_one({"x": 1})
+        self.addAsyncCleanup(client.db.test.drop)
 
         async def task():
-            await client.db.test.find_one({"$where": delay(1.0)})
+            await client.db.test.find_one({"$where": delay(0.2)})
 
         task = asyncio.create_task(task())
 
@@ -50,11 +50,13 @@ async def task():
     async def test_async_cancellation_aborts_transaction(self):
         client = await self.async_rs_or_single_client()
         await connected(client)
+        await client.db.test.insert_one({"x": 1})
+        self.addAsyncCleanup(client.db.test.drop)
 
         session = client.start_session()
 
         async def callback(session):
-            await client.db.test.find_one({"$where": delay(1.0)})
+            await client.db.test.find_one({"$where": delay(0.2)}, session=session)
 
         async def task():
             await session.with_transaction(callback)
@@ -69,3 +71,33 @@ async def task():
 
         self.assertFalse(session.in_transaction)
 
+    async def test_async_cancellation_kills_cursor(self):
+        client = await self.async_rs_or_single_client()
+        await connected(client)
+        for _ in range(2):
+            await client.db.test.insert_one({"x": 1})
+        self.addAsyncCleanup(client.db.test.drop)
+
+        cursor = client.db.test.find({}, batch_size=1)
+        await cursor.next()
+
+        # Make sure getMore commands block
+        fail_command = {
+            "configureFailPoint": "failCommand",
+            "mode": "alwaysOn",
+            "data": {"failCommands": ["getMore"], "blockConnection": True, "blockTimeMS": 200},
+        }
+
+        async def task():
+            async with self.fail_point(fail_command):
+                await cursor.next()
+
+        task = asyncio.create_task(task())
+
+        await asyncio.sleep(0.1)
+
+        task.cancel()
+        with self.assertRaises(asyncio.CancelledError):
+            await task
+
+        self.assertTrue(cursor._killed)