Reset shmem_exit_inprogress after shmem_exit()

petere · petere · commit 5e6e2c8773dd · 2018-07-12T20:22:17.000+02:00
In ad9a274, shmem_exit_inprogress was introduced. But we need to reset it after shmem_exit(), because unlike the similar proc_exit(), shmem_exit() can also be called for cleanup when the process will not exit. Reported-by: Andrew Gierth <andrew@tao11.riddles.org.uk>
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
@@ -272,6 +272,8 @@ shmem_exit(int code)
 		on_shmem_exit_list[on_shmem_exit_index].function(code,
 														 on_shmem_exit_list[on_shmem_exit_index].arg);
 	on_shmem_exit_index = 0;
+
+	shmem_exit_inprogress = false;
 }
 
 /* ----------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,8 @@ shmem_exit(int code)`
`272`	`272`	`on_shmem_exit_list[on_shmem_exit_index].function(code,`
`273`	`273`	`on_shmem_exit_list[on_shmem_exit_index].arg);`
`274`	`274`	`on_shmem_exit_index = 0;`
	`275`	`+`
	`276`	`+ shmem_exit_inprogress = false;`
`275`	`277`	`}`
`276`	`278`
`277`	`279`	`/* ----------------------------------------------------------------`