mirror of
https://github.com/postgres/postgres.git
synced 2025-11-12 05:01:15 +03:00
code: replace 'master' with 'primary' where appropriate.
Also changed "in the primary" to "on the primary", and added a few "the" before "primary". Author: Andres Freund Reviewed-By: David Steele Discussion: https://postgr.es/m/20200615182235.x7lch5n6kcjq4aue@alap3.anarazel.de
This commit is contained in:
@@ -654,8 +654,8 @@ XLogTruncateRelation(RelFileNode rnode, ForkNumber forkNum,
|
||||
*
|
||||
* We care about timelines in xlogreader when we might be reading xlog
|
||||
* generated prior to a promotion, either if we're currently a standby in
|
||||
* recovery or if we're a promoted master reading xlogs generated by the old
|
||||
* master before our promotion.
|
||||
* recovery or if we're a promoted primary reading xlogs generated by the old
|
||||
* primary before our promotion.
|
||||
*
|
||||
* wantPage must be set to the start address of the page to read and
|
||||
* wantLength to the amount of the page that will be read, up to
|
||||
@@ -878,7 +878,7 @@ read_local_xlog_page(XLogReaderState *state, XLogRecPtr targetPagePtr,
|
||||
* we actually read the xlog page, we might still try to read from the
|
||||
* old (now renamed) segment and fail. There's not much we can do
|
||||
* about this, but it can only happen when we're a leaf of a cascading
|
||||
* standby whose master gets promoted while we're decoding, so a
|
||||
* standby whose primary gets promoted while we're decoding, so a
|
||||
* one-off ERROR isn't too bad.
|
||||
*/
|
||||
XLogReadDetermineTimeline(state, targetPagePtr, reqLen);
|
||||
|
||||
Reference in New Issue
Block a user