NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6ad86fe

committed

Add CHECK_FOR_INTERRUPTS in ExecInsert's speculative insertion loop.

Ordinarily the functions called in this loop ought to have plentyof CFIs themselves; but we've now seen a case where no such CFI isreached, making the loop uninterruptible. Even though that's froma recently-introduced bug, it seems prudent to install a CFI atthe loop level in all branches.Per discussion of bug #17558 from Andrew Kesper (an actual fix forthat bug will follow).Discussion:https://postgr.es/m/17558-3f6599ffcf52fd4a@postgresql.org

1 parentcc11647 commit6ad86feCopy full SHA for 6ad86fe

File tree

1 file changed

-1

lines changed

src/backend/executor
- nodeModifyTable.c

1 file changed

-1

lines changed

`‎src/backend/executor/nodeModifyTable.c`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -956,9 +956,11 @@ ExecInsert(ModifyTableContext *context,`
`956`	`956`	`*`
`957`	`957`	`* We loop back here if we find a conflict below, either during`
`958`	`958`	`* the pre-check, or when we re-check after inserting the tuple`
`959`		`- * speculatively.`
	`959`	`+ * speculatively. Better allow interrupts in case some bug makes`
	`960`	`+ * this an infinite loop.`
`960`	`961`	`*/`
`961`	`962`	`vlock:`
	`963`	`+CHECK_FOR_INTERRUPTS();`
`962`	`964`	`specConflict= false;`
`963`	`965`	`if (!ExecCheckIndexConstraints(resultRelInfo,slot,estate,`
`964`	`966`	`&conflictTid,arbiterIndexes))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6ad86fe

File tree

1 file changed

1 file changed

`‎src/backend/executor/nodeModifyTable.c`

0 commit comments