NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit2d7f694

committed

Move btbulkdelete's vacuum_delay_point() call to a place in the loop where

we are not holding a buffer content lock; where it was, InterruptHoldoffCountis positive and so we'd not respond to cancel signals as intended. Alsoadd missing vacuum_delay_point() call in btvacuumcleanup. This should fixcomplaint from Evgeny Gridasov about failure to respond to SIGINT/SIGTERMin a timely fashion (bug #2257).

1 parent49758f4 commit2d7f694Copy full SHA for 2d7f694

File tree

1 file changed

-3

lines changed

src/backend/access/nbtree
- nbtree.c

1 file changed

-3

lines changed

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

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.140 2006/02/12 00:18:17 tgl Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.141 2006/02/14 17:20:01 tgl Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -580,8 +580,6 @@ btbulkdelete(PG_FUNCTION_ARGS)`
`580`	`580`	`maxoff;`
`581`	`581`	`BlockNumbernextpage;`
`582`	`582`
`583`		`-vacuum_delay_point();`
`584`		`-`
`585`	`583`	`ndeletable=0;`
`586`	`584`	`page=BufferGetPage(buf);`
`587`	`585`	`opaque= (BTPageOpaque)PageGetSpecialPointer(page);`
`@@ -638,6 +636,10 @@ btbulkdelete(PG_FUNCTION_ARGS)`
`638`	`636`	`}`
`639`	`637`	`else`
`640`	`638`	`_bt_relbuf(rel,buf);`
	`639`	`+`
	`640`	`+/* call vacuum_delay_point while not holding any buffer lock */`
	`641`	`+vacuum_delay_point();`
	`642`	`+`
`641`	`643`	`/* And advance to next page, if any */`
`642`	`644`	`if (nextpage==P_NONE)`
`643`	`645`	`break;`
`@@ -732,6 +734,8 @@ btvacuumcleanup(PG_FUNCTION_ARGS)`
`732`	`734`	`Pagepage;`
`733`	`735`	`BTPageOpaqueopaque;`
`734`	`736`
	`737`	`+vacuum_delay_point();`
	`738`	`+`
`735`	`739`	`/*`
`736`	`740`	`* We can't use _bt_getbuf() here because it always applies`
`737`	`741`	`* _bt_checkpage(), which will barf on an all-zero page. We want to`

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!

Commit2d7f694

File tree

1 file changed

1 file changed

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

0 commit comments