diff options
| author | Fujii Masao <fujii@postgresql.org> | 2021-05-19 13:48:19 +0900 |
|---|---|---|
| committer | Fujii Masao <fujii@postgresql.org> | 2021-05-19 13:48:19 +0900 |
| commit | 167bd4804995afd654bd97ca9486acbece24377e (patch) | |
| tree | fd876a514d421341ec0afe9383fb2efc1ab978e2 /src/backend/access/transam/xlog.c | |
| parent | 0a442a408b40d2c6710de7e5397cb2e769d8c630 (diff) | |
| download | postgresql-167bd4804995afd654bd97ca9486acbece24377e.tar.gz postgresql-167bd4804995afd654bd97ca9486acbece24377e.zip | |
Make standby promotion reset the recovery pause state to 'not paused'.
If a promotion is triggered while recovery is paused, the paused state ends
and promotion continues. But previously in that case
pg_get_wal_replay_pause_state() returned 'paused' wrongly while a promotion
was ongoing.
This commit changes a standby promotion so that it marks the recovery
pause state as 'not paused' when it's triggered, to fix the issue.
Author: Fujii Masao
Reviewed-by: Dilip Kumar, Kyotaro Horiguchi
Discussion: https://postgr.es/m/f706876c-4894-0ba5-6f4d-79803eeea21b@oss.nttdata.com
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 8d163f190f3..441a9124cd5 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -12825,6 +12825,14 @@ SetPromoteIsTriggered(void) XLogCtl->SharedPromoteIsTriggered = true; SpinLockRelease(&XLogCtl->info_lck); + /* + * Mark the recovery pause state as 'not paused' because the paused state + * ends and promotion continues if a promotion is triggered while recovery + * is paused. Otherwise pg_get_wal_replay_pause_state() can mistakenly + * return 'paused' while a promotion is ongoing. + */ + SetRecoveryPause(false); + LocalPromoteIsTriggered = true; } |