@@ -6505,7 +6505,7 @@ PerformRecoveryXLogAction(void)
65056505 else
65066506 {
65076507 RequestCheckpoint (CHECKPOINT_END_OF_RECOVERY |
6508- CHECKPOINT_IMMEDIATE |
6508+ CHECKPOINT_FAST |
65096509 CHECKPOINT_WAIT );
65106510 }
65116511
@@ -6814,7 +6814,7 @@ ShutdownXLOG(int code, Datum arg)
68146814 WalSndWaitStopping ();
68156815
68166816 if (RecoveryInProgress ())
6817- CreateRestartPoint (CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE );
6817+ CreateRestartPoint (CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_FAST );
68186818 else
68196819 {
68206820 /*
@@ -6826,7 +6826,7 @@ ShutdownXLOG(int code, Datum arg)
68266826 if (XLogArchivingActive ())
68276827 RequestXLogSwitch (false);
68286828
6829- CreateCheckPoint (CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE );
6829+ CreateCheckPoint (CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_FAST );
68306830 }
68316831}
68326832
@@ -6842,24 +6842,24 @@ LogCheckpointStart(int flags, bool restartpoint)
68426842 (errmsg ("restartpoint starting:%s%s%s%s%s%s%s%s" ,
68436843 (flags & CHECKPOINT_IS_SHUTDOWN ) ? " shutdown" : "" ,
68446844 (flags & CHECKPOINT_END_OF_RECOVERY ) ? " end-of-recovery" : "" ,
6845- (flags & CHECKPOINT_IMMEDIATE ) ? " immediate " : "" ,
6845+ (flags & CHECKPOINT_FAST ) ? " fast " : "" ,
68466846 (flags & CHECKPOINT_FORCE ) ? " force" : "" ,
68476847 (flags & CHECKPOINT_WAIT ) ? " wait" : "" ,
68486848 (flags & CHECKPOINT_CAUSE_XLOG ) ? " wal" : "" ,
68496849 (flags & CHECKPOINT_CAUSE_TIME ) ? " time" : "" ,
6850- (flags & CHECKPOINT_FLUSH_ALL ) ? " flush-all " : "" )));
6850+ (flags & CHECKPOINT_FLUSH_UNLOGGED ) ? " flush-unlogged " : "" )));
68516851 else
68526852 ereport (LOG ,
68536853 /* translator: the placeholders show checkpoint options */
68546854 (errmsg ("checkpoint starting:%s%s%s%s%s%s%s%s" ,
68556855 (flags & CHECKPOINT_IS_SHUTDOWN ) ? " shutdown" : "" ,
68566856 (flags & CHECKPOINT_END_OF_RECOVERY ) ? " end-of-recovery" : "" ,
6857- (flags & CHECKPOINT_IMMEDIATE ) ? " immediate " : "" ,
6857+ (flags & CHECKPOINT_FAST ) ? " fast " : "" ,
68586858 (flags & CHECKPOINT_FORCE ) ? " force" : "" ,
68596859 (flags & CHECKPOINT_WAIT ) ? " wait" : "" ,
68606860 (flags & CHECKPOINT_CAUSE_XLOG ) ? " wal" : "" ,
68616861 (flags & CHECKPOINT_CAUSE_TIME ) ? " time" : "" ,
6862- (flags & CHECKPOINT_FLUSH_ALL ) ? " flush-all " : "" )));
6862+ (flags & CHECKPOINT_FLUSH_UNLOGGED ) ? " flush-unlogged " : "" )));
68636863}
68646864
68656865/*
@@ -7042,12 +7042,12 @@ update_checkpoint_display(int flags, bool restartpoint, bool reset)
70427042 * flags is a bitwise OR of the following:
70437043 * CHECKPOINT_IS_SHUTDOWN: checkpoint is for database shutdown.
70447044 * CHECKPOINT_END_OF_RECOVERY: checkpoint is for end of WAL recovery.
7045- * CHECKPOINT_IMMEDIATE : finish the checkpoint ASAP,
7046- * ignoring checkpoint_completion_target parameter.
7045+ * CHECKPOINT_FAST : finish the checkpoint ASAP, ignoring
7046+ * checkpoint_completion_target parameter.
70477047 * CHECKPOINT_FORCE: force a checkpoint even if no XLOG activity has occurred
70487048 * since the last one (implied by CHECKPOINT_IS_SHUTDOWN or
70497049 * CHECKPOINT_END_OF_RECOVERY).
7050- * CHECKPOINT_FLUSH_ALL : also flush buffers of unlogged tables.
7050+ * CHECKPOINT_FLUSH_UNLOGGED : also flush buffers of unlogged tables.
70517051 *
70527052 * Note: flags contains other bits, of interest here only for logging purposes.
70537053 * In particular note that this routine is synchronous and does not pay
@@ -8946,9 +8946,8 @@ issue_xlog_fsync(int fd, XLogSegNo segno, TimeLineID tli)
89468946 * backup state and tablespace map.
89478947 *
89488948 * Input parameters are "state" (the backup state), "fast" (if true, we do
8949- * the checkpoint in immediate mode to make it faster), and "tablespaces"
8950- * (if non-NULL, indicates a list of tablespaceinfo structs describing the
8951- * cluster's tablespaces.).
8949+ * the checkpoint in fast mode), and "tablespaces" (if non-NULL, indicates a
8950+ * list of tablespaceinfo structs describing the cluster's tablespaces.).
89528951 *
89538952 * The tablespace map contents are appended to passed-in parameter
89548953 * tablespace_map and the caller is responsible for including it in the backup
@@ -9076,11 +9075,11 @@ do_pg_backup_start(const char *backupidstr, bool fast, List **tablespaces,
90769075 * during recovery means that checkpointer is running, we can use
90779076 * RequestCheckpoint() to establish a restartpoint.
90789077 *
9079- * We use CHECKPOINT_IMMEDIATE only if requested by user (via
9080- * passing fast = true). Otherwise this can take awhile.
9078+ * We use CHECKPOINT_FAST only if requested by user (via passing
9079+ * fast = true). Otherwise this can take awhile.
90819080 */
90829081 RequestCheckpoint (CHECKPOINT_FORCE | CHECKPOINT_WAIT |
9083- (fast ? CHECKPOINT_IMMEDIATE : 0 ));
9082+ (fast ? CHECKPOINT_FAST : 0 ));
90849083
90859084 /*
90869085 * Now we need to fetch the checkpoint record location, and also
0 commit comments