Commit6de6ee1

committed

Fix eventloop stuck in docker-based tests.aio-libs/aiopg#375

1 parente7196a9 commit6de6ee1Copy full SHA for 6de6ee1

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ def status(self):`
`159`	`159`	`serialized_aggs[conn_id][aggname]=agg.as_dict()`
`160`	`160`	`agg.clear_values()`
`161`	`161`
`162`		`-self.child_pipe.send(serialized_aggs)`
	`162`	`+yieldfromself.child_pipe.coro_send(serialized_aggs)`
`163`	`163`	`else:`
`164`	`164`	`print('evloop: unknown message')`
`165`	`165`
`@@ -185,7 +185,11 @@ def exec_tx(self, tx_block, aggname_prefix, conn_i):`
`185`	`185`	`print('Connected %s, %d'% (aggname_prefix,conn_i+1) )`
`186`	`186`
`187`	`187`	`if (notcur)orcur.closed:`
`188`		`-cur=yieldfromconn.cursor(timeout=10)`
	`188`	`+# big timeout here is important because on timeout`
	`189`	`+# expiration psycopg tries to call PQcancel() which`
	`190`	`+# tries to create blocking connection to postgres and`
	`191`	`+# blocks evloop`
	`192`	`+cur=yieldfromconn.cursor(timeout=3600)`
`189`	`193`
`190`	`194`	`# ROLLBACK tx after previous exception.`
`191`	`195`	`# Doing this here instead of except handler to stay inside try`

Comments

(0)