Fix end timeout race condition (backport)

porsager · porsager · commit 8c2e17da4a65 · 2021-03-23T23:16:45.000+01:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -79,7 +79,9 @@ function Connection(options = {}) {
   }
 
   function destroy() {
-    error(errors.connection('DESTROYED', options))
+    const err = errors.connection('DESTROYED', options)
+    backend.query && backend.query.reject(err)
+    error(err)
     socket.destroy()
   }
 
diff --git a/lib/index.js b/lib/index.js
@@ -322,13 +322,10 @@ function Postgres(a, b) {
 
     let destroy
 
-    if (timeout === 0)
-      return ended = Promise.all(all.map(c => c.destroy())).then(() => undefined)
-
     return ended = Promise.race([
       Promise.all(all.map(c => c.end()))
     ].concat(
-      timeout > 0
+      timeout === 0 || timeout > 0
         ? new Promise(r => destroy = setTimeout(() => (all.map(c => c.destroy()), r()), timeout * 1000))
         : []
     ))
diff --git a/tests/index.js b/tests/index.js
@@ -419,6 +419,13 @@ t('Connection destroyed', async() => {
   return ['CONNECTION_DESTROYED', await sql``.catch(x => x.code)]
 })
 
+t('Connection destroyed with query before', async() => {
+  const sql = postgres(options)
+  let error = sql`select pg_sleep(0.2)`.catch(err => err.code)
+  sql.end({ timeout: 0 })
+  return ['CONNECTION_DESTROYED', await error]
+})
+
 t('Message not supported', async() => {
   await sql`create table test (x int)`
   return ['MESSAGE_NOT_SUPPORTED', await sql`copy test to stdout`.catch(x => x.code)]

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,9 @@ function Connection(options = {}) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`function destroy() {`
`82`		`- error(errors.connection('DESTROYED', options))`
	`82`	`+ const err = errors.connection('DESTROYED', options)`
	`83`	`+ backend.query && backend.query.reject(err)`
	`84`	`+ error(err)`
`83`	`85`	`socket.destroy()`
`84`	`86`	`}`
`85`	`87`