hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!4182 【资源池化】对于请求页面长时间等待的日志，避免其打印到前端gsql

Browse Source 
Merge pull request !4182 from 董宁/bugfix8_up
This commit is contained in:
opengauss_bot
2023-09-21 15:10:33 +00:00
committed by Gitee
parent 9eabaa3c03 47e77fa184
commit 1ec1076d8a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gausskernel/storage/buffer/bufmgr.cpp
View File

@ -5960,10 +5960,13 @@ retry:
long sleep_time = SSGetBufSleepTime(dms_retry_times); long sleep_time = SSGetBufSleepTime(dms_retry_times);
if (sleep_time == SS_BUF_MAX_WAIT_TIME && !SS_IN_REFORM) { if (sleep_time == SS_BUF_MAX_WAIT_TIME && !SS_IN_REFORM) {
volatile BufferTag *tag = &buf->tag; 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", "buf_id:%d",
tag->rnode.spcNode, tag->rnode.dbNode, tag->rnode.relNode, tag->rnode.bucketNode, tag->rnode.spcNode, tag->rnode.dbNode, tag->rnode.relNode, tag->rnode.bucketNode,
tag->forkNum, tag->blockNum, buf->buf_id)))); tag->forkNum, tag->blockNum, buf->buf_id))));
t_thrd.postgres_cxt.whereToSendOutput = output_backup;
} }
pg_usleep(sleep_time); pg_usleep(sleep_time);
goto retry; goto retry;
@ -6077,10 +6080,13 @@ retry:
long sleep_time = SSGetBufSleepTime(dms_retry_times); long sleep_time = SSGetBufSleepTime(dms_retry_times);
if (sleep_time == SS_BUF_MAX_WAIT_TIME && !SS_IN_REFORM) { if (sleep_time == SS_BUF_MAX_WAIT_TIME && !SS_IN_REFORM) {
volatile BufferTag *tag = &buf->tag; 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", "buf_id:%d",
tag->rnode.spcNode, tag->rnode.dbNode, tag->rnode.relNode, tag->rnode.bucketNode, tag->rnode.spcNode, tag->rnode.dbNode, tag->rnode.relNode, tag->rnode.bucketNode,
tag->forkNum, tag->blockNum, buf->buf_id)))); tag->forkNum, tag->blockNum, buf->buf_id))));
t_thrd.postgres_cxt.whereToSendOutput = output_backup;
} }
pg_usleep(sleep_time); pg_usleep(sleep_time);
goto retry; goto retry;