From 0b3ba015cdbf5d9dd95c9c7c7305a40a72e1fc5a Mon Sep 17 00:00:00 2001 From: congzhou2603 Date: Thu, 15 Aug 2024 14:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bugfix=E3=80=91=E4=BF=AE=E5=A4=8Dnorma?= =?UTF-8?q?l=20reform=E6=97=B6=E5=9C=A8checkpoint=E5=89=8D=20=E8=AF=AF?= =?UTF-8?q?=E5=88=B7=E5=8E=9F=E4=B8=BB=E7=9A=84=E6=8E=A7=E5=88=B6=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=88=B0=E8=87=AA=E5=B7=B1=E7=9A=84=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/storage/access/transam/xlog.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gausskernel/storage/access/transam/xlog.cpp b/src/gausskernel/storage/access/transam/xlog.cpp index a526d8c1c1..e7a295540d 100755 --- a/src/gausskernel/storage/access/transam/xlog.cpp +++ b/src/gausskernel/storage/access/transam/xlog.cpp @@ -10162,8 +10162,9 @@ void StartupXLOG(void) * 1. standby node failover promoting. * 2. standby node switchover promoting. * 3. standby node start ondemand realtime build. + * 4. last ondemand-recovery redo phase failed, so read control file from origin primary during normal reform. */ - if (!SS_STANDBY_FAILOVER && !SS_STANDBY_PROMOTING && SS_ONDEMAND_REALTIME_BUILD_DISABLED) { + if (!(ENABLE_DMS && g_instance.dms_cxt.SSRecoveryInfo.recovery_inst_id != SS_MY_INST_ID)) { UpdateControlFile(); } -- Gitee