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

Commit875353b

Browse files
committed
Fix assorted core dumps and Assert failures that could occur during
AbortTransaction or AbortSubTransaction, when trying to clean up after anerror that prevented (sub)transaction start from completing:* access to TopTransactionResourceOwner that might not exist* assert failure in AtEOXact_GUC, if AtStart_GUC not called yet* assert failure or core dump in AfterTriggerEndSubXact, if AfterTriggerBeginSubXact not called yetPer testing by injecting elog(ERROR) at successive steps in StartTransactionand StartSubTransaction. It's not clear whether all of these cases couldreally occur in the field, but at least one of them is easily exposed bysimple stress testing, as per my accidental discovery yesterday.
1 parent74f4be6 commit875353b

File tree

3 files changed

+54
-37
lines changed

3 files changed

+54
-37
lines changed

‎src/backend/access/transam/xact.c

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.281 2010/01/16 10:05:50 sriggs Exp $
13+
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.282 2010/01/24 21:49:17 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -2170,37 +2170,40 @@ AbortTransaction(void)
21702170

21712171
/*
21722172
* Post-abort cleanup.See notes in CommitTransaction() concerning
2173-
* ordering.
2173+
* ordering. We can skip all of it if the transaction failed before
2174+
* creating a resource owner.
21742175
*/
2176+
if (TopTransactionResourceOwner!=NULL)
2177+
{
2178+
CallXactCallbacks(XACT_EVENT_ABORT);
21752179

2176-
CallXactCallbacks(XACT_EVENT_ABORT);
2177-
2178-
ResourceOwnerRelease(TopTransactionResourceOwner,
2179-
RESOURCE_RELEASE_BEFORE_LOCKS,
2180-
false, true);
2181-
AtEOXact_Buffers(false);
2182-
AtEOXact_RelationCache(false);
2183-
AtEOXact_Inval(false);
2184-
smgrDoPendingDeletes(false);
2185-
AtEOXact_MultiXact();
2186-
ResourceOwnerRelease(TopTransactionResourceOwner,
2187-
RESOURCE_RELEASE_LOCKS,
2188-
false, true);
2189-
ResourceOwnerRelease(TopTransactionResourceOwner,
2190-
RESOURCE_RELEASE_AFTER_LOCKS,
2191-
false, true);
2192-
AtEOXact_CatCache(false);
2193-
2194-
AtEOXact_GUC(false,1);
2195-
AtEOXact_SPI(false);
2196-
AtEOXact_on_commit_actions(false);
2197-
AtEOXact_Namespace(false);
2198-
AtEOXact_Files();
2199-
AtEOXact_ComboCid();
2200-
AtEOXact_HashTables(false);
2201-
AtEOXact_PgStat(false);
2202-
AtEOXact_Snapshot(false);
2203-
pgstat_report_xact_timestamp(0);
2180+
ResourceOwnerRelease(TopTransactionResourceOwner,
2181+
RESOURCE_RELEASE_BEFORE_LOCKS,
2182+
false, true);
2183+
AtEOXact_Buffers(false);
2184+
AtEOXact_RelationCache(false);
2185+
AtEOXact_Inval(false);
2186+
smgrDoPendingDeletes(false);
2187+
AtEOXact_MultiXact();
2188+
ResourceOwnerRelease(TopTransactionResourceOwner,
2189+
RESOURCE_RELEASE_LOCKS,
2190+
false, true);
2191+
ResourceOwnerRelease(TopTransactionResourceOwner,
2192+
RESOURCE_RELEASE_AFTER_LOCKS,
2193+
false, true);
2194+
AtEOXact_CatCache(false);
2195+
2196+
AtEOXact_GUC(false,1);
2197+
AtEOXact_SPI(false);
2198+
AtEOXact_on_commit_actions(false);
2199+
AtEOXact_Namespace(false);
2200+
AtEOXact_Files();
2201+
AtEOXact_ComboCid();
2202+
AtEOXact_HashTables(false);
2203+
AtEOXact_PgStat(false);
2204+
AtEOXact_Snapshot(false);
2205+
pgstat_report_xact_timestamp(0);
2206+
}
22042207

22052208
/*
22062209
* State remains TRANS_ABORT until CleanupTransaction().

‎src/backend/commands/trigger.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.259 2010/01/17 22:56:21 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.260 2010/01/24 21:49:17 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -3690,10 +3690,9 @@ AfterTriggerEndSubXact(bool isCommit)
36903690
/*
36913691
* Pop the prior state if needed.
36923692
*/
3693-
Assert(my_level<afterTriggers->maxtransdepth);
3694-
36953693
if (isCommit)
36963694
{
3695+
Assert(my_level<afterTriggers->maxtransdepth);
36973696
/* If we saved a prior state, we don't need it anymore */
36983697
state=afterTriggers->state_stack[my_level];
36993698
if (state!=NULL)
@@ -3706,8 +3705,16 @@ AfterTriggerEndSubXact(bool isCommit)
37063705
else
37073706
{
37083707
/*
3709-
* Aborting. Release any event lists from queries being aborted, and
3710-
* restore query_depth to its pre-subxact value.
3708+
* Aborting. It is possible subxact start failed before calling
3709+
* AfterTriggerBeginSubXact, in which case we mustn't risk touching
3710+
* stack levels that aren't there.
3711+
*/
3712+
if (my_level >=afterTriggers->maxtransdepth)
3713+
return;
3714+
3715+
/*
3716+
* Release any event lists from queries being aborted, and restore
3717+
* query_depth to its pre-subxact value.
37113718
*/
37123719
while (afterTriggers->query_depth>afterTriggers->depth_stack[my_level])
37133720
{

‎src/backend/utils/misc/guc.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.534 2010/01/23 16:37:12 sriggs Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.535 2010/01/24 21:49:17 tgl Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -3904,7 +3904,14 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
39043904
boolstill_dirty;
39053905
inti;
39063906

3907-
Assert(nestLevel>0&&nestLevel <=GUCNestLevel);
3907+
/*
3908+
* Note: it's possible to get here with GUCNestLevel == nestLevel-1 during
3909+
* abort, if there is a failure during transaction start before
3910+
* AtStart_GUC is called.
3911+
*/
3912+
Assert(nestLevel>0&&
3913+
(nestLevel <=GUCNestLevel||
3914+
(nestLevel==GUCNestLevel+1&& !isCommit)));
39083915

39093916
/* Quick exit if nothing's changed in this transaction */
39103917
if (!guc_dirty)

0 commit comments

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