Merge pull request #339 from TimothyFitz/conn-pool-check-exception

Don't reuse connections when StreamReader has an exception

Author: terrycain

aiomysql/pool.py

@@ -148,7 +148,7 @@ async def _fill_free_pool(self, override_min):
         n = 0
         while n < free_size:
             conn = self._free[-1]
-            if conn._reader.at_eof():
+            if conn._reader.at_eof() or conn._reader.exception():
                 self._free.pop()
                 conn.close()
 

tests/test_pool.py

@@ -493,6 +493,7 @@ async def test_cancelled_connection(pool_creator, loop):
         assert list(res) == [(2, 0)]
 
 
+@pytest.mark.run_loop
 async def test_pool_with_connection_recycling(pool_creator, loop):
     pool = await pool_creator(minsize=1, maxsize=1, pool_recycle=3)
     async with pool.get() as conn:
@@ -509,3 +510,19 @@ async def test_pool_with_connection_recycling(pool_creator, loop):
         await cur.execute('SELECT 1;')
         val = await cur.fetchone()
         assert (1,) == val
+
+
+@pytest.mark.run_loop
+async def test_pool_drops_connection_with_exception(pool_creator, loop):
+    pool = await pool_creator(minsize=1, maxsize=1)
+
+    async with pool.get() as conn:
+        cur = await conn.cursor()
+        await cur.execute('SELECT 1;')
+
+    connection, = pool._free
+    connection._writer._protocol.connection_lost(IOError())
+
+    async with pool.get() as conn:
+        cur = await conn.cursor()
+        await cur.execute('SELECT 1;')