Add CHECK_FOR_INTERRUPTS while restoring changes during decoding.

Amit Kapila · reshke · commit 398b6fb8dff2 · 2026-03-16T20:20:58.000Z
Previously in commit 42681dffaf, we added CFI during decoding changes but missed another similar case that can happen while restoring changes spilled to disk back into memory in a loop. Reported-by: Robert Haas Author: Amit Kapila Backpatch-through: 10 Discussion: https://postgr.es/m/CA+TgmoaLObg0QbstbC8ykDwOdD1bDkr4AbPpB=0DPgA2JW0mFg@mail.gmail.com
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
@@ -4103,6 +4103,8 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn,
 		int			readBytes;
 		ReorderBufferDiskChange *ondisk;
 
+		CHECK_FOR_INTERRUPTS();
+
 		if (*fd == -1)
 		{
 			char		path[MAXPGPATH];

Original file line number	Diff line number	Diff line change
`@@ -4103,6 +4103,8 @@ ReorderBufferRestoreChanges(ReorderBuffer rb, ReorderBufferTXN txn,`
`4103`	`4103`	`int readBytes;`
`4104`	`4104`	`ReorderBufferDiskChange *ondisk;`
`4105`	`4105`
	`4106`	`+ CHECK_FOR_INTERRUPTS();`
	`4107`	`+`
`4106`	`4108`	`if (*fd == -1)`
`4107`	`4109`	`{`
`4108`	`4110`	`char path[MAXPGPATH];`