summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2019-07-26 15:17:03 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2019-07-26 15:17:03 -0400
commit46c193213adb4cbcdd0f8198b361de27d0ca13fe (patch)
tree1cc63b99ca106f7ed7610bd050053fb6d2ba6e60
parent55862b2e93030b6720123f888217a557532dd894 (diff)
Fix possible lockup in pgbench with -R.
pgbench would sometimes get stuck waiting forever after its last client thread terminated, due to failing to check for there being nothing more to wait for. Bug introduced during refactoring in v10 (I didn't bother to try to assign blame to a specific commit). It's already repaired in HEAD/v12 thanks to commit 3bac77c48, but v10 and v11 need this fix. Fabien Coelho, per report from Tomas Vondra; reviewed by Yoshikazu Imai Discussion: https://postgr.es/m/cc5d76c1-6144-bbed-ad1b-961d13d88f3b@2ndquadrant.com
-rw-r--r--src/bin/pgbench/pgbench.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index 2bdfc89d2a5..0c1b01ecdae 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -4515,6 +4515,10 @@ threadRun(void *arg)
}
}
+ /* under throttling we may have finished the last client above */
+ if (remains == 0)
+ break;
+
/* also wake up to print the next progress report on time */
if (progress && min_usec > 0 && thread->tid == 0)
{