Use WaitLatch() instead of pg_usleep() at end-of-vacuum truncation

michaelpq · michaelpq · commit 70685385d70f · 2021-07-02T12:58:34.000+09:00
This has the advantage to make a process more responsive when the postmaster dies, even if the wait time was rather limited as there was only a 50ms timeout here. Another advantage of this change is for monitoring, as we gain a new wait event for the end-of-vacuum truncation. Author: Bharath Rupireddy Reviewed-by: Aleksander Alekseev, Thomas Munro, Michael Paquier Discussion: https://postgr.es/m/CALj2ACU4AdPCq6NLfcA-ZGwX7pPCK5FgEj-CAU0xCKzkASSy_A@mail.gmail.com
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
@@ -2242,6 +2242,11 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
       <entry><literal>VacuumDelay</literal></entry>
       <entry>Waiting in a cost-based vacuum delay point.</entry>
      </row>
+     <row>
+      <entry><literal>VacuumTruncate</literal></entry>
+      <entry>Waiting to acquire an exclusive lock to truncate off any
+       empty pages at the end of a table vacuumed.</entry>
+     </row>
     </tbody>
    </tgroup>
   </table>
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
@@ -3236,7 +3236,11 @@ lazy_truncate_heap(LVRelState *vacrel)
 				return;
 			}
 
-			pg_usleep(VACUUM_TRUNCATE_LOCK_WAIT_INTERVAL * 1000L);
+			(void) WaitLatch(MyLatch,
+							 WL_LATCH_SET | WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
+							 VACUUM_TRUNCATE_LOCK_WAIT_INTERVAL,
+							 WAIT_EVENT_VACUUM_TRUNCATE);
+			ResetLatch(MyLatch);
 		}
 
 		/*
diff --git a/src/backend/utils/activity/wait_event.c b/src/backend/utils/activity/wait_event.c
@@ -485,6 +485,9 @@ pgstat_get_wait_timeout(WaitEventTimeout w)
 		case WAIT_EVENT_VACUUM_DELAY:
 			event_name = "VacuumDelay";
 			break;
+		case WAIT_EVENT_VACUUM_TRUNCATE:
+			event_name = "VacuumTruncate";
+			break;
 			/* no default case, so that compiler will warn */
 	}
 
diff --git a/src/include/utils/wait_event.h b/src/include/utils/wait_event.h
@@ -140,7 +140,8 @@ typedef enum
 	WAIT_EVENT_PG_SLEEP,
 	WAIT_EVENT_RECOVERY_APPLY_DELAY,
 	WAIT_EVENT_RECOVERY_RETRIEVE_RETRY_INTERVAL,
-	WAIT_EVENT_VACUUM_DELAY
+	WAIT_EVENT_VACUUM_DELAY,
+	WAIT_EVENT_VACUUM_TRUNCATE
 } WaitEventTimeout;
 
 /* ----------

Original file line number	Diff line number	Diff line change
`@@ -3236,7 +3236,11 @@ lazy_truncate_heap(LVRelState *vacrel)`
`3236`	`3236`	`return;`
`3237`	`3237`	`}`
`3238`	`3238`
`3239`		`- pg_usleep(VACUUM_TRUNCATE_LOCK_WAIT_INTERVAL * 1000L);`
	`3239`	`+ (void) WaitLatch(MyLatch,`
	`3240`	`+ WL_LATCH_SET \| WL_TIMEOUT \| WL_EXIT_ON_PM_DEATH,`
	`3241`	`+ VACUUM_TRUNCATE_LOCK_WAIT_INTERVAL,`
	`3242`	`+ WAIT_EVENT_VACUUM_TRUNCATE);`
	`3243`	`+ ResetLatch(MyLatch);`
`3240`	`3244`	`}`
`3241`	`3245`
`3242`	`3246`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -485,6 +485,9 @@ pgstat_get_wait_timeout(WaitEventTimeout w)`
`485`	`485`	`case WAIT_EVENT_VACUUM_DELAY:`
`486`	`486`	`event_name = "VacuumDelay";`
`487`	`487`	`break;`
	`488`	`+ case WAIT_EVENT_VACUUM_TRUNCATE:`
	`489`	`+ event_name = "VacuumTruncate";`
	`490`	`+ break;`
`488`	`491`	`/* no default case, so that compiler will warn */`
`489`	`492`	`}`
`490`	`493`