diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2022-08-04 14:10:06 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2022-08-04 14:10:06 -0400 |
| commit | efba7a63ffbe59790b88e3af459dfd81c742b90f (patch) | |
| tree | cd75e6e73b6b3cb1ca1a1ec814874d4c83d9c764 /src/backend/executor/nodeModifyTable.c | |
| parent | 1a9ac84923b8530ca18d497b3ccc40965c01b66b (diff) | |
| download | postgresql-efba7a63ffbe59790b88e3af459dfd81c742b90f.tar.gz postgresql-efba7a63ffbe59790b88e3af459dfd81c742b90f.zip | |
Add CHECK_FOR_INTERRUPTS in ExecInsert's speculative insertion loop.
Ordinarily the functions called in this loop ought to have plenty
of CFIs themselves; but we've now seen a case where no such CFI is
reached, making the loop uninterruptible. Even though that's from
a recently-introduced bug, it seems prudent to install a CFI at
the loop level in all branches.
Per discussion of bug #17558 from Andrew Kesper (an actual fix for
that bug will follow).
Discussion: https://postgr.es/m/17558-3f6599ffcf52fd4a@postgresql.org
Diffstat (limited to 'src/backend/executor/nodeModifyTable.c')
| -rw-r--r-- | src/backend/executor/nodeModifyTable.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index d328856ae5b..1e79d18bf35 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -832,9 +832,11 @@ ExecInsert(ModifyTableState *mtstate, * * We loop back here if we find a conflict below, either during * the pre-check, or when we re-check after inserting the tuple - * speculatively. + * speculatively. Better allow interrupts in case some bug makes + * this an infinite loop. */ vlock: + CHECK_FOR_INTERRUPTS(); specConflict = false; if (!ExecCheckIndexConstraints(resultRelInfo, slot, estate, &conflictTid, arbiterIndexes)) |