From 47e77fa1843752636b8d9931c6e3c9f98ae22785 Mon Sep 17 00:00:00 2001 From: dongning12 Date: Thu, 21 Sep 2023 09:59:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E6=B1=A0=E5=8C=96?= =?UTF-8?q?=E3=80=91=E5=AF=B9=E4=BA=8E=E8=AF=B7=E6=B1=82=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=95=BF=E6=97=B6=E9=97=B4=E7=AD=89=E5=BE=85=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=8C=E9=81=BF=E5=85=8D=E5=85=B6=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=88=B0=E5=89=8D=E7=AB=AFgsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/storage/buffer/bufmgr.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gausskernel/storage/buffer/bufmgr.cpp b/src/gausskernel/storage/buffer/bufmgr.cpp index e807eb956e..ffa42c0407 100644 --- a/src/gausskernel/storage/buffer/bufmgr.cpp +++ b/src/gausskernel/storage/buffer/bufmgr.cpp @@ -5961,10 +5961,13 @@ retry: long sleep_time = SSGetBufSleepTime(dms_retry_times); if (sleep_time == SS_BUF_MAX_WAIT_TIME && !SS_IN_REFORM) { volatile BufferTag *tag = &buf->tag; - ereport(WARNING, (errmodule(MOD_DMS), (errmsg("[SS buf][%u/%u/%u/%d %d-%u] request buf timeout, " + int output_backup = t_thrd.postgres_cxt.whereToSendOutput; + t_thrd.postgres_cxt.whereToSendOutput = DestNone; + ereport(WARNING, (errmodule(MOD_DMS), (errmsg("[SS buf][%u/%u/%u/%d %d-%u] LockBuffer, request buf timeout, " "buf_id:%d", tag->rnode.spcNode, tag->rnode.dbNode, tag->rnode.relNode, tag->rnode.bucketNode, tag->forkNum, tag->blockNum, buf->buf_id)))); + t_thrd.postgres_cxt.whereToSendOutput = output_backup; } pg_usleep(sleep_time); goto retry; @@ -6078,10 +6081,13 @@ retry: long sleep_time = SSGetBufSleepTime(dms_retry_times); if (sleep_time == SS_BUF_MAX_WAIT_TIME && !SS_IN_REFORM) { volatile BufferTag *tag = &buf->tag; - ereport(WARNING, (errmodule(MOD_DMS), (errmsg("[SS buf][%u/%u/%u/%d %d-%u] request buf timeout, " + int output_backup = t_thrd.postgres_cxt.whereToSendOutput; + t_thrd.postgres_cxt.whereToSendOutput = DestNone; + ereport(WARNING, (errmodule(MOD_DMS), (errmsg("[SS buf][%u/%u/%u/%d %d-%u] ConditionalLockBuffer， request buf timeout, " "buf_id:%d", tag->rnode.spcNode, tag->rnode.dbNode, tag->rnode.relNode, tag->rnode.bucketNode, tag->forkNum, tag->blockNum, buf->buf_id)))); + t_thrd.postgres_cxt.whereToSendOutput = output_backup; } pg_usleep(sleep_time); goto retry; -- Gitee