diff options
| -rw-r--r-- | src/bin/pgbench/pgbench.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index 4a7ac1f8213..5129aea5160 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -59,6 +59,7 @@ #include "common/int.h" #include "common/logging.h" +#include "fe_utils/cancel.h" #include "fe_utils/conditional.h" #include "getopt_long.h" #include "libpq-fe.h" @@ -3894,6 +3895,9 @@ initGenerateDataClientSide(PGconn *con) exit(1); } + if (CancelRequested) + break; + /* * If we want to stick with the original logging, print a message each * 100k inserted rows. @@ -4109,6 +4113,9 @@ runInitSteps(const char *initialize_steps) if ((con = doConnect()) == NULL) exit(1); + setup_cancel_handler(NULL); + SetCancelConn(con); + for (step = initialize_steps; *step != '\0'; step++) { instr_time start; @@ -4176,6 +4183,7 @@ runInitSteps(const char *initialize_steps) } fprintf(stderr, "done in %.2f s (%s).\n", run_time, stats.data); + ResetCancelConn(); PQfinish(con); termPQExpBuffer(&stats); } |