Make sure to close the transactions after repack_one_table

dvarrazzo · dvarrazzo · commit fb07fad34a73 · 2013-04-18T02:29:51.000+01:00
If we exit early (e.g. checking the triggers) repack_cleanup() is not called
but we must close the transactions anyway.
diff --git a/bin/pg_repack.c b/bin/pg_repack.c
@@ -1253,6 +1253,10 @@ repack_one_table(const repack_table *table, const char *orderby)
 	if (vxid)
 		free(vxid);
 
+	/* Rollback current transactions */
+	pgut_rollback(connection);
+	pgut_rollback(conn2);
+
 	/* XXX: distinguish between fatal and non-fatal errors via the first
 	 * arg to repack_cleanup().
 	 */
@@ -1491,10 +1495,6 @@ repack_cleanup(bool fatal, const repack_table *table)
 		char		buffer[12];
 		const char *params[1];
 
-		/* Rollback current transactions */
-		pgut_rollback(connection);
-		pgut_rollback(conn2);
-
 		/* Try reconnection if not available. */
 		if (PQstatus(connection) != CONNECTION_OK ||
 			PQstatus(conn2) != CONNECTION_OK)
