diff options
| author | Simon Riggs | 2010-01-14 11:08:02 +0000 |
|---|---|---|
| committer | Simon Riggs | 2010-01-14 11:08:02 +0000 |
| commit | e99767bc28d8ef9ea627cd63336b2b74087c0128 (patch) | |
| tree | 29cae5f633b1ede8d959daec86aa2bb40170326d /src/backend/commands/tablespace.c | |
| parent | 0fba3bef558036952f59846a7e7b48e1f5b9e479 (diff) | |
First part of refactoring of code for ResolveRecoveryConflict. Purposes
of this are to centralise the conflict code to allow further change,
as well as to allow passing through the full reason for the conflict
through to the conflicting backends. Backend state alters how we
can handle different types of conflict so this is now required.
As originally suggested by Heikki, no longer optional.
Diffstat (limited to 'src/backend/commands/tablespace.c')
| -rw-r--r-- | src/backend/commands/tablespace.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 1eaa0abeea2..2ff3835ab0f 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -40,7 +40,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.71 2010/01/12 02:42:51 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.72 2010/01/14 11:08:01 sriggs Exp $ * *------------------------------------------------------------------------- */ @@ -1377,33 +1377,7 @@ tblspc_redo(XLogRecPtr lsn, XLogRecord *record) */ if (!destroy_tablespace_directories(xlrec->ts_id, true)) { - VirtualTransactionId *temp_file_users; - - /* - * Standby users may be currently using this tablespace for - * for their temporary files. We only care about current - * users because temp_tablespace parameter will just ignore - * tablespaces that no longer exist. - * - * Ask everybody to cancel their queries immediately so - * we can ensure no temp files remain and we can remove the - * tablespace. Nuke the entire site from orbit, it's the only - * way to be sure. - * - * XXX: We could work out the pids of active backends - * using this tablespace by examining the temp filenames in the - * directory. We would then convert the pids into VirtualXIDs - * before attempting to cancel them. - * - * We don't wait for commit because drop tablespace is - * non-transactional. - */ - temp_file_users = GetConflictingVirtualXIDs(InvalidTransactionId, - InvalidOid, - false); - ResolveRecoveryConflictWithVirtualXIDs(temp_file_users, - "drop tablespace", - CONFLICT_MODE_ERROR); + ResolveRecoveryConflictWithTablespace(xlrec->ts_id); /* * If we did recovery processing then hopefully the |