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

Improved error handling for repack_table_indexes()

Browse Source 
If we do not successfully build any indexes on the target table, bail out
early instead of acquiring an ACCESS EXCLUSIVE lock on the table.
This commit is contained in:
Josh Kupershmidt 2013-07-01 21:11:37 -04:00
parent fa9af9ddc0
commit cd0b4ebf9d
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/pg_repack.c
View File

@ -1617,7 +1617,7 @@ repack_table_indexes(PGresult *index_details)
char buffer[2][12];
const char *create_idx, *schema_name, *table_name, *params[3];
Oid table, index;
int i, num;
int i, num, num_repacked = 0;
bool *repacked_indexes;
num = PQntuples(index_details);
@ -1679,7 +1679,10 @@ repack_table_indexes(PGresult *index_details)
schema_name, index)));
}
else
{
repacked_indexes[i] = true;
num_repacked++;
}
CLEARPGRES(res);
CLEARPGRES(res2);
@ -1689,7 +1692,21 @@ repack_table_indexes(PGresult *index_details)
getstr(index_details, i, 0));
}
/* take exclusive lock on table before calling repack_index_swap() */
/* If we did not successfully repack any indexes, e.g. because of some
* error affecting every CREATE INDEX attempt, don't waste time with
* the ACCESS EXCLUSIVE lock on the table, and return false.
* N.B. none of the DROP INDEXes should be performed since
* repacked_indexes[] flags should all be false.
*/
if (!num_repacked)
{
elog(WARNING,
"Skipping index swapping for \"%s\", since no new indexes built",
table_name);
goto drop_idx;
}
/* take an exclusive lock on table before calling repack_index_swap() */
initStringInfo(&sql);
appendStringInfo(&sql, "LOCK TABLE %s IN ACCESS EXCLUSIVE MODE",
table_name);