database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

Move StartupCLOG() calls to just after we initialize ShmemVariableCache.

Browse Source 
Previously, the hot_standby=off code path did this at end of recovery,
while the hot_standby=on code path did it at the beginning of recovery.
It's better to do this in only one place because (a) it's simpler,
(b) StartupCLOG() is trivial so trying to postpone the work isn't
useful, and (c) this will make it possible to simplify some other
logic.

Patch by me, reviewed by Heikki Linnakangas.

Discussion: http://postgr.es/m/CA+TgmoZYig9+AQodhF5sRXuKkJ=RgFDugLr3XX_dz_F-p=TwTg@mail.gmail.com
This commit is contained in:
Robert Haas 2021-01-27 12:20:46 -05:00
parent e42b3c3bd6
commit 1f113abdf8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/access/transam/xlog.c
View File

@ -6855,6 +6855,13 @@ StartupXLOG(void)
*/ */
StartupReorderBuffer(); StartupReorderBuffer();
/*
* Startup CLOG. This must be done after ShmemVariableCache->nextXid
* has been initialized and before we accept connections or begin WAL
* replay.
*/
StartupCLOG();
/* /*
* Startup MultiXact. We need to do this early to be able to replay * Startup MultiXact. We need to do this early to be able to replay
* truncations. * truncations.
@ -7125,11 +7132,10 @@ StartupXLOG(void)
ProcArrayInitRecovery(XidFromFullTransactionId(ShmemVariableCache->nextXid)); ProcArrayInitRecovery(XidFromFullTransactionId(ShmemVariableCache->nextXid));
/* /*
* Startup commit log and subtrans only. MultiXact and commit * Startup subtrans only. CLOG, MultiXact and commit
* timestamp have already been started up and other SLRUs are not * timestamp have already been started up and other SLRUs are not
* maintained during recovery and need not be started yet. * maintained during recovery and need not be started yet.
*/ */
StartupCLOG();
StartupSUBTRANS(oldestActiveXID); StartupSUBTRANS(oldestActiveXID);
/* /*
@ -7945,14 +7951,11 @@ StartupXLOG(void)
LWLockRelease(ProcArrayLock); LWLockRelease(ProcArrayLock);
/* /*
* Start up the commit log and subtrans, if not already done for hot * Start up subtrans, if not already done for hot standby. (commit
* standby. (commit timestamps are started below, if necessary.) * timestamps are started below, if necessary.)
*/ */
if (standbyState == STANDBY_DISABLED) if (standbyState == STANDBY_DISABLED)
{
StartupCLOG();
StartupSUBTRANS(oldestActiveXID); StartupSUBTRANS(oldestActiveXID);
}
/* /*
* Perform end of recovery actions for any SLRUs that need it. * Perform end of recovery actions for any SLRUs that need it.