From 831798774f4526dfba4f540384eddfdd0bc9885d Mon Sep 17 00:00:00 2001 From: "arcoalien@qq.com" Date: Thu, 28 Mar 2024 17:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=BB=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E4=B8=8D=E8=B5=B0?= =?UTF-8?q?rebuild=E9=80=BB=E8=BE=91=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 | 2 +- src/gausskernel/storage/buffer/bufmgr.cpp | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/gausskernel/ddes/adapter/ss_dms_callback.cpp b/src/gausskernel/ddes/adapter/ss_dms_callback.cpp index 8b8d1272f..d04ae88dd 100644 --- a/src/gausskernel/ddes/adapter/ss_dms_callback.cpp +++ b/src/gausskernel/ddes/adapter/ss_dms_callback.cpp @@ -1285,7 +1285,7 @@ static bool SSCheckBufferIfCanGoRebuild(BufferDesc* buf_desc, uint64 buf_state) dms_buf_ctrl_t *buf_ctrl = GetDmsBufCtrl(buf_desc->buf_id); if ((buf_state & BM_VALID) && (buf_ctrl->lock_mode != (unsigned char)DMS_LOCK_NULL)) { ret = true; - } else if ((buf_state & BM_TAG_VALID) && (buf_ctrl->lock_mode != (unsigned char)DMS_LOCK_NULL) && !(buf_ctrl->state | BUF_IS_EXTEND)) { + } else if ((buf_state & BM_TAG_VALID) && (buf_ctrl->lock_mode != (unsigned char)DMS_LOCK_NULL)) { if (LWLockConditionalAcquire(buf_desc->io_in_progress_lock, LW_SHARED)) { ret = true; } else { diff --git a/src/gausskernel/storage/buffer/bufmgr.cpp b/src/gausskernel/storage/buffer/bufmgr.cpp index 991ab1d67..40f5e693d 100644 --- a/src/gausskernel/storage/buffer/bufmgr.cpp +++ b/src/gausskernel/storage/buffer/bufmgr.cpp @@ -2190,14 +2190,6 @@ static bool ReadBuffer_common_ReadBlock(SMgrRelation smgr, char relpersistence, } } - if (ENABLE_DMS) { - Buffer buf = BlockGetBuffer((char *)bufBlock); - dms_buf_ctrl_t *buf_ctrl = GetDmsBufCtrl(buf - 1); - if (buf_ctrl->lock_mode == DMS_LOCK_NULL) { - ereport(PANIC, (errmsg("It seemd read buffer not across DMS!"))); - } - } - return needputtodirty; }