farrokhi/pg_repack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't perform repack_cleanup() if we haven't actually set up z_repack_trigger etc.

Browse Source 
Fixes a regression introduced in master (by the multiple --tables
changes, I think).
This commit is contained in:
Josh Kupershmidt 2012-12-13 18:55:19 -07:00
parent 0bdb4bb96f
commit b4d8a90437
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/pg_repack.c
View File

@ -575,6 +575,14 @@ repack_one_table(const repack_table *table, const char *orderby)
StringInfoData sql;
bool have_error = false;
/* Keep track of whether we have gotten through setup to install
* the z_repack_trigger, log table, etc. ourselves. We don't want to
* go through repack_cleanup() if we didnt' actually set up the
* trigger ourselves, lest we be cleaning up another pg_repack's mess,
* or worse, interfering with a still-running pg_repack.
*/
bool table_init = false;
initStringInfo(&sql);
elog(DEBUG2, "---- repack_one_table ----");
@ -695,6 +703,12 @@ repack_one_table(const repack_table *table, const char *orderby)
*/
command("COMMIT", 0, NULL);
/* The main connection has now committed its z_repack_trigger,
* log table, and temp. table. If any error occurs from this point
* on and we bail out, we should try to clean those up.
*/
table_init = true;
/* Keep looping PQgetResult() calls until it returns NULL, indicating the
* command is done and we have obtained our lock.
*/
@ -911,7 +925,7 @@ cleanup:
/* XXX: distinguish between fatal and non-fatal errors via the first
* arg to repack_cleanup().
*/
if (have_error)
if (have_error && table_init)
repack_cleanup(false, table);
}