From 216851d9f7aa6a86f29796573f6bb22789a98ac0 Mon Sep 17 00:00:00 2001
From: chendong76 <1209756284@qq.com>
Date: Tue, 17 Oct 2023 10:36:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E6=8C=89=E9=9C=80=E5=9B=9E?=
 =?UTF-8?q?=E6=94=BE=E9=98=B6=E6=AE=B5=E4=B8=BB=E5=8A=A8switchover?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=81=B6=E7=8E=B0=E8=BD=BB=E9=87=8F=E7=BA=A7?=
 =?UTF-8?q?=E9=94=81coredump=E7=9A=84=E9=97=AE=E9=A2=98;2.=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E6=8C=89=E9=9C=80=E5=9B=9E=E6=94=BE=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E5=81=B6=E7=8E=B0flushcopy=E6=A0=A1=E9=AA=8C=E4=B8=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gausskernel/ddes/adapter/ss_dms_bufmgr.cpp    | 2 +-
 src/gausskernel/process/postmaster/postmaster.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gausskernel/ddes/adapter/ss_dms_bufmgr.cpp b/src/gausskernel/ddes/adapter/ss_dms_bufmgr.cpp
index 55f3ef20ad..e8d69e1dac 100644
--- a/src/gausskernel/ddes/adapter/ss_dms_bufmgr.cpp
+++ b/src/gausskernel/ddes/adapter/ss_dms_bufmgr.cpp
@@ -884,7 +884,7 @@ bool SSHelpFlushBufferIfNeed(BufferDesc* buf_desc)
         }
 
         XLogRecPtr pagelsn = BufferGetLSN(buf_desc);
-        if (!SS_IN_REFORM) {
+        if (!SS_IN_REFORM && !SS_IN_ONDEMAND_RECOVERY) {
             ereport(PANIC,
                 (errmsg("[SS] this buffer should not exist with BUF_DIRTY_NEED_FLUSH but not in reform, "
                 "spc/db/rel/bucket fork-block: %u/%u/%u/%d %d-%u, page lsn (0x%llx), seg info:%u-%u",
diff --git a/src/gausskernel/process/postmaster/postmaster.cpp b/src/gausskernel/process/postmaster/postmaster.cpp
index 8e471e6f3a..2402b09440 100644
--- a/src/gausskernel/process/postmaster/postmaster.cpp
+++ b/src/gausskernel/process/postmaster/postmaster.cpp
@@ -10020,7 +10020,6 @@ static void sigusr1_handler(SIGNAL_ARGS)
     }
 
     if (ENABLE_DMS && (mode = CheckSwitchoverSignal())) {
-        SSReadControlFile(REFORM_CTRL_PAGE);
         if (SS_NORMAL_STANDBY && pmState == PM_RUN && !SS_STANDBY_ONDEMAND_RECOVERY) {
             SSDoSwitchover();
         } else {
-- 
Gitee