Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1b9c889

Browse files
committed
[refer #PGPRO-3213] revert commit which sends SIGQUIT instead of SIGUSR2 to checkpointer and do not report error in case of WAL activity during online upgrade
1 parent f7c2e11 commit 1b9c889

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/backend/access/transam/xlog.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include "port/atomics.h"
4747
#include "postmaster/bgwriter.h"
4848
#include "postmaster/walwriter.h"
49+
#include "postmaster/postmaster.h"
4950
#include "postmaster/startup.h"
5051
#include "replication/basebackup.h"
5152
#include "replication/logical.h"
@@ -8837,7 +8838,7 @@ CreateCheckPoint(int flags)
88378838
* We now have ProcLastRecPtr = start of actual checkpoint record, recptr
88388839
* = end of actual checkpoint record.
88398840
*/
8840-
if (shutdown && checkPoint.redo != ProcLastRecPtr)
8841+
if (shutdown && checkPoint.redo != ProcLastRecPtr && OnlineUpgradePath == NULL)
88418842
ereport(PANIC,
88428843
(errmsg("concurrent write-ahead log activity while database system is shutting down")));
88438844

src/backend/postmaster/postmaster.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ UpgradePostgres(void)
786786
IsOnlineUpgrade = true;
787787
TerminateChildren(SIGTERM);
788788
if (CheckpointerPID != 0)
789-
signal_child(CheckpointerPID, SIGQUIT /*SIGUSR2*/);
789+
signal_child(CheckpointerPID, SIGUSR2);
790790

791791
if (!SavePostmasterParameters())
792792
{

0 commit comments

Comments
 (0)