Commit7d435cf

authored

gh-136234: FixSelectorSocketTransport.writelines to be robust to connection loss (#136743)

1 parentc6f8b2f commit7d435cfCopy full SHA for 7d435cf

File tree

+25

-0

lines changed

+25

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1174,6 +1174,13 @@ def writelines(self, list_of_data):`
`1174`	`1174`	`raiseRuntimeError('unable to writelines; sendfile is in progress')`
`1175`	`1175`	`ifnotlist_of_data:`
`1176`	`1176`	`return`
	`1177`	`+`
	`1178`	`+ifself._conn_lost:`
	`1179`	`+ifself._conn_lost>=constants.LOG_THRESHOLD_FOR_CONNLOST_WRITES:`
	`1180`	`+logger.warning('socket.send() raised exception.')`
	`1181`	`+self._conn_lost+=1`
	`1182`	`+return`
	`1183`	`+`
`1177`	`1184`	`self._buffer.extend([memoryview(data)fordatainlist_of_data])`
`1178`	`1185`	`self._write_ready()`
`1179`	`1186`	`# If the entire buffer couldn't be written, register a write handler`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -854,6 +854,22 @@ def test_writelines_pauses_protocol(self):`
`854`	`854`	`self.assertTrue(self.sock.send.called)`
`855`	`855`	`self.assertTrue(self.loop.writers)`
`856`	`856`
	`857`	`+deftest_writelines_after_connection_lost(self):`
	`858`	`+# GH-136234`
	`859`	`+transport=self.socket_transport()`
	`860`	`+self.sock.send=mock.Mock()`
	`861`	`+self.sock.send.side_effect=ConnectionResetError`
	`862`	`+transport.write(b'data1')# Will fail immediately, causing connection lost`
	`863`	`+`
	`864`	`+transport.writelines([b'data2'])`
	`865`	`+self.assertFalse(transport._buffer)`
	`866`	`+self.assertFalse(self.loop.writers)`
	`867`	`+`
	`868`	`+test_utils.run_briefly(self.loop)# Allow _call_connection_lost to run`
	`869`	`+transport.writelines([b'data2'])`
	`870`	`+self.assertFalse(transport._buffer)`
	`871`	`+self.assertFalse(self.loop.writers)`
	`872`	`+`
`857`	`873`	`@unittest.skipUnless(selector_events._HAS_SENDMSG,'no sendmsg')`
`858`	`874`	`deftest_write_sendmsg_full(self):`
`859`	`875`	`data=memoryview(b'data')`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix:meth:`asyncio.WriteTransport.writelines` to be robust to connection
	`2`	+failure, by using the same behavior as:meth:`~asyncio.WriteTransport.write`.

Comments

(0)