Fix bug that can cause walsender not to terminating at shutdown.

anarazel · anarazel · commit b51c8efc6aff · 2017-08-24T15:21:32.000-07:00
When backpatching c6c3334 I (Andres Freund) mis-resolved a conflict in the 9.4 branch. Unfortunately that leads to walsenders waiting forever when shutting down with connected standbys, unless immediate mode is used, or the standbys are forced to disconnect by other means. Author: Marco Nenciarini Reported-By: Abhijit Gharami, Marco Nenciarini Discussion: http://postgr.es/m/1434ad79-ab0d-d6a9-4ea2-1afb1c06adaf@2ndquadrant.it http://postgr.es/m/CAA5_DuD0O1XyM8OnOzhRepyPU-t8nZKLzs1pT2JpzP0NS+vVNA@mail.gmail.com Backpatch: 9.4 only
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -2658,6 +2658,7 @@ WalSndLastCycleHandler(SIGNAL_ARGS)
 {
 	int			save_errno = errno;
 
+	got_SIGUSR2 = true;
 	if (MyWalSnd)
 		SetLatch(&MyWalSnd->latch);
 

Original file line number	Diff line number	Diff line change
`@@ -2658,6 +2658,7 @@ WalSndLastCycleHandler(SIGNAL_ARGS)`
`2658`	`2658`	`{`
`2659`	`2659`	`int save_errno = errno;`
`2660`	`2660`
	`2661`	`+ got_SIGUSR2 = true;`
`2661`	`2662`	`if (MyWalSnd)`
`2662`	`2663`	`SetLatch(&MyWalSnd->latch);`
`2663`	`2664`