From d3141a539ab115452dead51cb9de8e88f6013cc5 Mon Sep 17 00:00:00 2001
From: congzhou2603 <zhoucong42@huawei.com>
Date: Thu, 26 Sep 2024 15:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bugfix=E3=80=91=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=9E=84=E5=BB=BA=E8=AF=B7=E6=B1=82=E4=B8=BB?=
 =?UTF-8?q?=E6=9C=BA=E5=81=9Acheckpoint=E6=97=B6=E9=95=BF=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=B2=A1=E6=9C=89=E5=AE=8C=E6=88=90=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4mes=E8=B5=84=E6=BA=90=E8=A2=AB=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=E7=9A=84=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_callback.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gausskernel/ddes/adapter/ss_dms_callback.cpp b/src/gausskernel/ddes/adapter/ss_dms_callback.cpp
index 3ccffbfe5..406cdf9f8 100644
--- a/src/gausskernel/ddes/adapter/ss_dms_callback.cpp
+++ b/src/gausskernel/ddes/adapter/ss_dms_callback.cpp
@@ -2245,8 +2245,11 @@ int CBDoCheckpointImmediately(unsigned long long *ckpt_lsn)
 {
     Assert(SS_PRIMARY_MODE);
 
-    RequestCheckpoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_WAIT);
+    RequestCheckpoint(CHECKPOINT_IMMEDIATE);
+    pg_usleep(REFORM_WAIT_LONG);
+    LWLockAcquire(ControlFileLock, LW_SHARED);
     *ckpt_lsn = (unsigned long long)t_thrd.shemem_ptr_cxt.ControlFile->checkPointCopy.redo;
+    LWLockRelease(ControlFileLock);
     return GS_SUCCESS;
 }