mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-09 08:10:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes to recovery pause behaviour.

Browse Source 
Change location LOG message so it works each time we pause, not
just for final pause.
Ensure that we pause only if we are in Hot Standby and can connect
to allow us to run resume function. This change supercedes the
code to override parameter recoveryPauseAtTarget to false if not
attempting to enter Hot Standby, which is now removed.
This commit is contained in:
Simon Riggs 2011-03-23 19:35:53 +00:00
parent ba7d020d9d
commit b5f2f2a712
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5691,6 +5691,10 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
static void
recoveryPausesHere(void)
{
ereport(LOG,
(errmsg("recovery has paused"),
errhint("Execute pg_xlog_replay_resume() to continue.")));
while (RecoveryIsPaused())
{
pg_usleep(1000000L); /* 1000 ms */
@ -6357,13 +6361,6 @@ StartupXLOG(void)
StandbyRecoverPreparedTransactions(false);
}
}
else
{
/*
* Must not pause unless we are going to enter Hot Standby.
*/
recoveryPauseAtTarget = false;
}
/* Initialize resource managers */
for (rmid = 0; rmid <= RM_MAX_ID; rmid++)
@ -6485,11 +6482,11 @@ StartupXLOG(void)
*/
if (recoveryStopsHere(record, &recoveryApply))
{
if (recoveryPauseAtTarget)
/*
* Pause only if users can connect to send a resume message
*/
if (recoveryPauseAtTarget && standbyState == STANDBY_SNAPSHOT_READY)
{
ereport(LOG,
(errmsg("recovery has paused"),
errhint("Execute pg_xlog_replay_resume() to continue.")));
SetRecoveryPause(true);
recoveryPausesHere();
}
@ -6522,7 +6519,10 @@ StartupXLOG(void)
recoveryPause = xlogctl->recoveryPause;
SpinLockRelease(&xlogctl->info_lck);
if (recoveryPause)
/*
* Pause only if users can connect to send a resume message
*/
if (recoveryPause && standbyState == STANDBY_SNAPSHOT_READY)
recoveryPausesHere();
/*