Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite99767b

Browse files
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 conflictthrough to the conflicting backends. Backend state alters how wecan handle different types of conflict so this is now required.As originally suggested by Heikki, no longer optional.
1 parent0fba3be commite99767b

File tree

6 files changed

+144
-151
lines changed

6 files changed

+144
-151
lines changed

‎src/backend/access/heap/heapam.c

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.281 2010/01/10 04:26:36 rhaas Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.282 2010/01/14 11:08:00 sriggs Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -4139,16 +4139,7 @@ heap_xlog_cleanup_info(XLogRecPtr lsn, XLogRecord *record)
41394139
xl_heap_cleanup_info*xlrec= (xl_heap_cleanup_info*)XLogRecGetData(record);
41404140

41414141
if (InHotStandby)
4142-
{
4143-
VirtualTransactionId*backends;
4144-
4145-
backends=GetConflictingVirtualXIDs(xlrec->latestRemovedXid,
4146-
InvalidOid,
4147-
true);
4148-
ResolveRecoveryConflictWithVirtualXIDs(backends,
4149-
"VACUUM index cleanup",
4150-
CONFLICT_MODE_ERROR);
4151-
}
4142+
ResolveRecoveryConflictWithSnapshot(xlrec->latestRemovedXid);
41524143

41534144
/*
41544145
* Actual operation is a no-op. Record type exists to provide a means
@@ -4180,16 +4171,7 @@ heap_xlog_clean(XLogRecPtr lsn, XLogRecord *record, bool clean_move)
41804171
* no queries running for which the removed tuples are still visible.
41814172
*/
41824173
if (InHotStandby)
4183-
{
4184-
VirtualTransactionId*backends;
4185-
4186-
backends=GetConflictingVirtualXIDs(xlrec->latestRemovedXid,
4187-
InvalidOid,
4188-
true);
4189-
ResolveRecoveryConflictWithVirtualXIDs(backends,
4190-
"VACUUM heap cleanup",
4191-
CONFLICT_MODE_ERROR);
4192-
}
4174+
ResolveRecoveryConflictWithSnapshot(xlrec->latestRemovedXid);
41934175

41944176
RestoreBkpBlocks(lsn,record, true);
41954177

@@ -4259,25 +4241,7 @@ heap_xlog_freeze(XLogRecPtr lsn, XLogRecord *record)
42594241
* consider the frozen xids as running.
42604242
*/
42614243
if (InHotStandby)
4262-
{
4263-
VirtualTransactionId*backends;
4264-
4265-
/*
4266-
* XXX: Using cutoff_xid is overly conservative. Even if cutoff_xid
4267-
* is recent enough to conflict with a backend, the actual values
4268-
* being frozen might not be. With a typical vacuum_freeze_min_age
4269-
* setting in the ballpark of millions of transactions, it won't make
4270-
* a difference, but it might if you run a manual VACUUM FREEZE.
4271-
* Typically the cutoff is much earlier than any recently deceased
4272-
* tuple versions removed by this vacuum, so don't worry too much.
4273-
*/
4274-
backends=GetConflictingVirtualXIDs(cutoff_xid,
4275-
InvalidOid,
4276-
true);
4277-
ResolveRecoveryConflictWithVirtualXIDs(backends,
4278-
"VACUUM heap freeze",
4279-
CONFLICT_MODE_ERROR);
4280-
}
4244+
ResolveRecoveryConflictWithSnapshot(cutoff_xid);
42814245

42824246
RestoreBkpBlocks(lsn,record, false);
42834247

‎src/backend/access/nbtree/nbtxlog.c

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.57 2010/01/02 16:57:35 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.58 2010/01/14 11:08:00 sriggs Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -822,28 +822,18 @@ btree_redo(XLogRecPtr lsn, XLogRecord *record)
822822
* just once when that arrives. After that any we know that no conflicts
823823
* exist from individual btree vacuum records on that index.
824824
*/
825-
if (InHotStandby)
825+
if (InHotStandby&&info==XLOG_BTREE_DELETE)
826826
{
827-
if (info==XLOG_BTREE_DELETE)
828-
{
829-
xl_btree_delete*xlrec= (xl_btree_delete*)XLogRecGetData(record);
830-
VirtualTransactionId*backends;
831-
832-
/*
833-
* XXX Currently we put everybody on death row, because
834-
* currently _bt_delitems() supplies InvalidTransactionId.
835-
* This can be fairly painful, so providing a better value
836-
* here is worth some thought and possibly some effort to
837-
* improve.
838-
*/
839-
backends=GetConflictingVirtualXIDs(xlrec->latestRemovedXid,
840-
InvalidOid,
841-
true);
827+
xl_btree_delete*xlrec= (xl_btree_delete*)XLogRecGetData(record);
842828

843-
ResolveRecoveryConflictWithVirtualXIDs(backends,
844-
"b-tree delete",
845-
CONFLICT_MODE_ERROR);
846-
}
829+
/*
830+
* XXX Currently we put everybody on death row, because
831+
* currently _bt_delitems() supplies InvalidTransactionId.
832+
* This can be fairly painful, so providing a better value
833+
* here is worth some thought and possibly some effort to
834+
* improve.
835+
*/
836+
ResolveRecoveryConflictWithSnapshot(xlrec->latestRemovedXid);
847837
}
848838

849839
/*

‎src/backend/commands/dbcommands.c

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.231 2010/01/10 15:44:28 sriggs Exp $
16+
* $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.232 2010/01/14 11:08:00 sriggs Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -1944,29 +1944,7 @@ dbase_redo(XLogRecPtr lsn, XLogRecord *record)
19441944
dst_path=GetDatabasePath(xlrec->db_id,xlrec->tablespace_id);
19451945

19461946
if (InHotStandby)
1947-
{
1948-
/*
1949-
* We don't do ResolveRecoveryConflictWithVirutalXIDs() here since
1950-
* that only waits for transactions and completely idle sessions
1951-
* would block us. This is rare enough that we do this as simply
1952-
* as possible: no wait, just force them off immediately.
1953-
*
1954-
* No locking is required here because we already acquired
1955-
* AccessExclusiveLock. Anybody trying to connect while we do this
1956-
* will block during InitPostgres() and then disconnect when they
1957-
* see the database has been removed.
1958-
*/
1959-
while (CountDBBackends(xlrec->db_id)>0)
1960-
{
1961-
CancelDBBackends(xlrec->db_id);
1962-
1963-
/*
1964-
* Wait awhile for them to die so that we avoid flooding an
1965-
* unresponsive backend when system is heavily loaded.
1966-
*/
1967-
pg_usleep(10000);
1968-
}
1969-
}
1947+
ResolveRecoveryConflictWithDatabase(xlrec->db_id);
19701948

19711949
/* Drop pages for this database that are in the shared buffer cache */
19721950
DropDatabaseBuffers(xlrec->db_id);

‎src/backend/commands/tablespace.c

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*
4141
*
4242
* IDENTIFICATION
43-
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.71 2010/01/12 02:42:51 momjian Exp $
43+
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.72 2010/01/14 11:08:01 sriggs Exp $
4444
*
4545
*-------------------------------------------------------------------------
4646
*/
@@ -1377,33 +1377,7 @@ tblspc_redo(XLogRecPtr lsn, XLogRecord *record)
13771377
*/
13781378
if (!destroy_tablespace_directories(xlrec->ts_id, true))
13791379
{
1380-
VirtualTransactionId*temp_file_users;
1381-
1382-
/*
1383-
* Standby users may be currently using this tablespace for
1384-
* for their temporary files. We only care about current
1385-
* users because temp_tablespace parameter will just ignore
1386-
* tablespaces that no longer exist.
1387-
*
1388-
* Ask everybody to cancel their queries immediately so
1389-
* we can ensure no temp files remain and we can remove the
1390-
* tablespace. Nuke the entire site from orbit, it's the only
1391-
* way to be sure.
1392-
*
1393-
* XXX: We could work out the pids of active backends
1394-
* using this tablespace by examining the temp filenames in the
1395-
* directory. We would then convert the pids into VirtualXIDs
1396-
* before attempting to cancel them.
1397-
*
1398-
* We don't wait for commit because drop tablespace is
1399-
* non-transactional.
1400-
*/
1401-
temp_file_users=GetConflictingVirtualXIDs(InvalidTransactionId,
1402-
InvalidOid,
1403-
false);
1404-
ResolveRecoveryConflictWithVirtualXIDs(temp_file_users,
1405-
"drop tablespace",
1406-
CONFLICT_MODE_ERROR);
1380+
ResolveRecoveryConflictWithTablespace(xlrec->ts_id);
14071381

14081382
/*
14091383
* If we did recovery processing then hopefully the

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp