@@ -273,7 +273,7 @@ static bool restoredFromArchive = false;
273273
274274/* Buffers dedicated to consistency checks of size BLCKSZ */
275275static char * replay_image_masked = NULL ;
276- static char * master_image_masked = NULL ;
276+ static char * primary_image_masked = NULL ;
277277
278278/* options formerly taken from recovery.conf for archive recovery */
279279char * recoveryRestoreCommand = NULL ;
@@ -784,7 +784,7 @@ typedef enum
784784 XLOG_FROM_ANY = 0 , /* request to read WAL from any source */
785785 XLOG_FROM_ARCHIVE , /* restored using restore_command */
786786 XLOG_FROM_PG_WAL , /* existing file in pg_wal */
787- XLOG_FROM_STREAM /* streamed from master */
787+ XLOG_FROM_STREAM /* streamed from primary */
788788} XLogSource ;
789789
790790/* human-readable names for XLogSources, for debugging output */
@@ -1478,21 +1478,21 @@ checkXLogConsistency(XLogReaderState *record)
14781478 * page here, a local buffer is fine to hold its contents and a mask
14791479 * can be directly applied on it.
14801480 */
1481- if (!RestoreBlockImage (record , block_id , master_image_masked ))
1481+ if (!RestoreBlockImage (record , block_id , primary_image_masked ))
14821482 elog (ERROR , "failed to restore block image" );
14831483
14841484 /*
1485- * If masking function is defined, mask both the master and replay
1485+ * If masking function is defined, mask both the primary and replay
14861486 * images
14871487 */
14881488 if (RmgrTable [rmid ].rm_mask != NULL )
14891489 {
14901490 RmgrTable [rmid ].rm_mask (replay_image_masked , blkno );
1491- RmgrTable [rmid ].rm_mask (master_image_masked , blkno );
1491+ RmgrTable [rmid ].rm_mask (primary_image_masked , blkno );
14921492 }
14931493
1494- /* Time to compare the master and replay images. */
1495- if (memcmp (replay_image_masked , master_image_masked , BLCKSZ ) != 0 )
1494+ /* Time to compare the primary and replay images. */
1495+ if (memcmp (replay_image_masked , primary_image_masked , BLCKSZ ) != 0 )
14961496 {
14971497 elog (FATAL ,
14981498 "inconsistent page found, rel %u/%u/%u, forknum %u, blkno %u" ,
@@ -2301,7 +2301,7 @@ CalculateCheckpointSegments(void)
23012301 * a) we keep WAL for only one checkpoint cycle (prior to PG11 we kept
23022302 * WAL for two checkpoint cycles to allow us to recover from the
23032303 * secondary checkpoint if the first checkpoint failed, though we
2304- * only did this on the master anyway, not on standby. Keeping just
2304+ * only did this on the primary anyway, not on standby. Keeping just
23052305 * one checkpoint simplifies processing and reduces disk space in
23062306 * many smaller databases.)
23072307 * b) during checkpoint, we consume checkpoint_completion_target *
@@ -3770,7 +3770,7 @@ XLogFileReadAnyTLI(XLogSegNo segno, int emode, XLogSource source)
37703770 * however, unless we actually find a valid segment. That way if there is
37713771 * neither a timeline history file nor a WAL segment in the archive, and
37723772 * streaming replication is set up, we'll read the timeline history file
3773- * streamed from the master when we start streaming, instead of recovering
3773+ * streamed from the primary when we start streaming, instead of recovering
37743774 * with a dummy history generated here.
37753775 */
37763776 if (expectedTLEs )
@@ -6057,7 +6057,7 @@ SetRecoveryPause(bool recoveryPause)
60576057
60586058/*
60596059 * When recovery_min_apply_delay is set, we wait long enough to make sure
6060- * certain record types are applied at least that interval behind the master .
6060+ * certain record types are applied at least that interval behind the primary .
60616061 *
60626062 * Returns true if we waited.
60636063 *
@@ -6239,7 +6239,7 @@ do { \
62396239 if ((currValue) < (minValue)) \
62406240 ereport(ERROR, \
62416241 (errcode(ERRCODE_INVALID_PARAMETER_VALUE), \
6242- errmsg("hot standby is not possible because %s = %d is a lower setting than on the master server (its value was %d)", \
6242+ errmsg("hot standby is not possible because %s = %d is a lower setting than on the primary server (its value was %d)", \
62436243 param_name, \
62446244 currValue, \
62456245 minValue))); \
@@ -6275,8 +6275,8 @@ CheckRequiredParameterValues(void)
62756275 {
62766276 if (ControlFile -> wal_level < WAL_LEVEL_REPLICA )
62776277 ereport (ERROR ,
6278- (errmsg ("hot standby is not possible because wal_level was not set to \"replica\" or higher on the master server" ),
6279- errhint ("Either set wal_level to \"replica\" on the master , or turn off hot_standby here." )));
6278+ (errmsg ("hot standby is not possible because wal_level was not set to \"replica\" or higher on the primary server" ),
6279+ errhint ("Either set wal_level to \"replica\" on the primary , or turn off hot_standby here." )));
62806280
62816281 /* We ignore autovacuum_max_workers when we make this test. */
62826282 RecoveryRequiresIntParameter ("max_connections" ,
@@ -6502,7 +6502,7 @@ StartupXLOG(void)
65026502 * alignment, whereas palloc() will provide MAXALIGN'd storage.
65036503 */
65046504 replay_image_masked = (char * ) palloc (BLCKSZ );
6505- master_image_masked = (char * ) palloc (BLCKSZ );
6505+ primary_image_masked = (char * ) palloc (BLCKSZ );
65066506
65076507 if (read_backup_label (& checkPointLoc , & backupEndRequired ,
65086508 & backupFromStandby ))
@@ -6631,7 +6631,7 @@ StartupXLOG(void)
66316631 * know how far we need to replay the WAL before we reach consistency.
66326632 * This can happen for example if a base backup is taken from a
66336633 * running server using an atomic filesystem snapshot, without calling
6634- * pg_start/stop_backup. Or if you just kill a running master server
6634+ * pg_start/stop_backup. Or if you just kill a running primary server
66356635 * and put it into archive recovery by creating a recovery signal
66366636 * file.
66376637 *
@@ -6829,7 +6829,7 @@ StartupXLOG(void)
68296829 * ourselves - the history file of the recovery target timeline covers all
68306830 * the previous timelines in the history too - a cascading standby server
68316831 * might be interested in them. Or, if you archive the WAL from this
6832- * server to a different archive than the master , it'd be good for all the
6832+ * server to a different archive than the primary , it'd be good for all the
68336833 * history files to get archived there after failover, so that you can use
68346834 * one of the old timelines as a PITR target. Timeline history files are
68356835 * small, so it's better to copy them unnecessarily than not copy them and
@@ -7065,7 +7065,7 @@ StartupXLOG(void)
70657065
70667066 /*
70677067 * If we're beginning at a shutdown checkpoint, we know that
7068- * nothing was running on the master at this point. So fake-up an
7068+ * nothing was running on the primary at this point. So fake-up an
70697069 * empty running-xacts record and use that here and now. Recover
70707070 * additional standby state for prepared transactions.
70717071 */
@@ -7233,7 +7233,7 @@ StartupXLOG(void)
72337233 }
72347234
72357235 /*
7236- * If we've been asked to lag the master , wait on latch until
7236+ * If we've been asked to lag the primary , wait on latch until
72377237 * enough time has passed.
72387238 */
72397239 if (recoveryApplyDelay (xlogreader ))
@@ -7348,7 +7348,7 @@ StartupXLOG(void)
73487348 /*
73497349 * If rm_redo called XLogRequestWalReceiverReply, then we wake
73507350 * up the receiver so that it notices the updated
7351- * lastReplayedEndRecPtr and sends a reply to the master .
7351+ * lastReplayedEndRecPtr and sends a reply to the primary .
73527352 */
73537353 if (doRequestWalReceiverReply )
73547354 {
@@ -9949,7 +9949,7 @@ xlog_redo(XLogReaderState *record)
99499949
99509950 /*
99519951 * If we see a shutdown checkpoint, we know that nothing was running
9952- * on the master at this point. So fake-up an empty running-xacts
9952+ * on the primary at this point. So fake-up an empty running-xacts
99539953 * record and use that here and now. Recover additional standby state
99549954 * for prepared transactions.
99559955 */
@@ -10663,7 +10663,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
1066310663 "since last restartpoint" ),
1066410664 errhint ("This means that the backup being taken on the standby "
1066510665 "is corrupt and should not be used. "
10666- "Enable full_page_writes and run CHECKPOINT on the master , "
10666+ "Enable full_page_writes and run CHECKPOINT on the primary , "
1066710667 "and then try an online backup again." )));
1066810668
1066910669 /*
@@ -10811,7 +10811,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
1081110811 appendStringInfo (labelfile , "BACKUP METHOD: %s\n" ,
1081210812 exclusive ? "pg_start_backup" : "streamed" );
1081310813 appendStringInfo (labelfile , "BACKUP FROM: %s\n" ,
10814- backup_started_in_recovery ? "standby" : "master " );
10814+ backup_started_in_recovery ? "standby" : "primary " );
1081510815 appendStringInfo (labelfile , "START TIME: %s\n" , strfbuf );
1081610816 appendStringInfo (labelfile , "LABEL: %s\n" , backupidstr );
1081710817 appendStringInfo (labelfile , "START TIMELINE: %u\n" , starttli );
@@ -11246,7 +11246,7 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
1124611246 "during online backup" ),
1124711247 errhint ("This means that the backup being taken on the standby "
1124811248 "is corrupt and should not be used. "
11249- "Enable full_page_writes and run CHECKPOINT on the master , "
11249+ "Enable full_page_writes and run CHECKPOINT on the primary , "
1125011250 "and then try an online backup again." )));
1125111251
1125211252
@@ -11928,7 +11928,7 @@ XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr, int reqLen,
1192811928 Assert (readFile != -1 );
1192911929
1193011930 /*
11931- * If the current segment is being streamed from master , calculate how
11931+ * If the current segment is being streamed from the primary , calculate how
1193211932 * much of the current page we have received already. We know the
1193311933 * requested record has been received, but this is for the benefit of
1193411934 * future calls, to allow quick exit at the top of this function.
@@ -11989,8 +11989,8 @@ XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr, int reqLen,
1198911989 * example, imagine a scenario where a streaming replica is started up,
1199011990 * and replay reaches a record that's split across two WAL segments. The
1199111991 * first page is only available locally, in pg_wal, because it's already
11992- * been recycled in the master . The second page, however, is not present
11993- * in pg_wal, and we should stream it from the master . There is a recycled
11992+ * been recycled on the primary . The second page, however, is not present
11993+ * in pg_wal, and we should stream it from the primary . There is a recycled
1199411994 * WAL segment present in pg_wal, with garbage contents, however. We would
1199511995 * read the first page from the local WAL segment, but when reading the
1199611996 * second page, we would read the bogus, recycled, WAL segment. If we
@@ -12150,7 +12150,7 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess,
1215012150 * Failure while streaming. Most likely, we got here
1215112151 * because streaming replication was terminated, or
1215212152 * promotion was triggered. But we also get here if we
12153- * find an invalid record in the WAL streamed from master ,
12153+ * find an invalid record in the WAL streamed from the primary ,
1215412154 * in which case something is seriously wrong. There's
1215512155 * little chance that the problem will just go away, but
1215612156 * PANIC is not good for availability either, especially
@@ -12511,7 +12511,7 @@ StartupRequestWalReceiverRestart(void)
1251112511 * we're retrying the exact same record that we've tried previously, only
1251212512 * complain the first time to keep the noise down. However, we only do when
1251312513 * reading from pg_wal, because we don't expect any invalid records in archive
12514- * or in records streamed from master . Files in the archive should be complete,
12514+ * or in records streamed from the primary . Files in the archive should be complete,
1251512515 * and we should never hit the end of WAL because we stop and wait for more WAL
1251612516 * to arrive before replaying it.
1251712517 *
0 commit comments