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

!5988 【资源池化】dms的线程打印error日志需要使用try-catch结构，否则线程会退出

Browse Source 
Merge pull request !5988 from 董宁/bugfix29_up
This commit is contained in:
opengauss_bot
2024-08-12 12:02:58 +00:00
committed by Gitee
parent 6f9c04d7a9 f9d7ef43fd
commit 5cf54f0cbf
1 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/gausskernel/ddes/adapter/ss_dms_callback.cpp
View File

@ -52,6 +52,8 @@
#include "storage/buf/bufmgr.h"
#include "storage/ipc.h"
static void ReleaseResource();
/*
* Wake up startup process to replay WAL, or to notice that
* failover has been requested.
@ -495,41 +497,55 @@ static int SetPrimaryIdOnStandby(int primary_id, unsigned long long list_stable)
{
char* type_string = NULL;
type_string = SSGetLogHeaderTypeStr();
int ret = DMS_SUCCESS;
for (int ntries = 0;; ntries++) {
SSReadControlFile(REFORM_CTRL_PAGE); /* need to double check */
if (g_instance.dms_cxt.SSReformerControl.primaryInstId == primary_id &&
g_instance.dms_cxt.SSReformerControl.list_stable == list_stable) {
ereport(LOG, (errmodule(MOD_DMS),
errmsg("%s Reform success, this is a standby:%d confirming new primary:%d, list_stable:%llu, "
"confirm ntries=%d.", type_string, SS_MY_INST_ID, primary_id, list_stable, ntries)));
return DMS_SUCCESS;
} else {
if (dms_reform_failed()) {
ereport(ERROR,
(errmodule(MOD_DMS), errmsg("%s Failed to confirm new primary: %d, list_stable:%llu, "
"control file indicates primary is %d, list_stable%llu; dms reform failed.",
type_string, (int)primary_id, list_stable,
g_instance.dms_cxt.SSReformerControl.primaryInstId,
g_instance.dms_cxt.SSReformerControl.list_stable)));
return DMS_ERROR;
}
if (ntries >= WAIT_REFORM_CTRL_REFRESH_TRIES) {
ereport(ERROR,
(errmodule(MOD_DMS), errmsg("%s Failed to confirm new primary: %d, list_stable:%llu, "
" control file indicates primary is %d, list_stable%llu; wait timeout.",
type_string, (int)primary_id, list_stable,
g_instance.dms_cxt.SSReformerControl.primaryInstId,
g_instance.dms_cxt.SSReformerControl.list_stable)));
return DMS_ERROR;
uint32 saveInterruptHoldoffCount = t_thrd.int_cxt.InterruptHoldoffCount;
PG_TRY();
{
for (int ntries = 0;; ntries++) {
SSReadControlFile(REFORM_CTRL_PAGE); /* need to double check */
if (g_instance.dms_cxt.SSReformerControl.primaryInstId == primary_id &&
g_instance.dms_cxt.SSReformerControl.list_stable == list_stable) {
ereport(LOG, (errmodule(MOD_DMS),
errmsg("%s Reform success, this is a standby:%d confirming new primary:%d, list_stable:%llu, "
"confirm ntries=%d.", type_string, SS_MY_INST_ID, primary_id, list_stable, ntries)));
ret = DMS_SUCCESS;
break;
} else {
if (dms_reform_failed()) {
ereport(ERROR,
(errmodule(MOD_DMS), errmsg("%s Failed to confirm new primary: %d, list_stable:%llu, "
"control file indicates primary is %d, list_stable%llu; dms reform failed.",
type_string, (int)primary_id, list_stable,
g_instance.dms_cxt.SSReformerControl.primaryInstId,
g_instance.dms_cxt.SSReformerControl.list_stable)));
ret = DMS_ERROR;
break;
}
if (ntries >= WAIT_REFORM_CTRL_REFRESH_TRIES) {
ereport(ERROR,
(errmodule(MOD_DMS), errmsg("%s Failed to confirm new primary: %d, list_stable:%llu, "
" control file indicates primary is %d, list_stable%llu; wait timeout.",
type_string, (int)primary_id, list_stable,
g_instance.dms_cxt.SSReformerControl.primaryInstId,
g_instance.dms_cxt.SSReformerControl.list_stable)));
ret = DMS_ERROR;
break;
}
}
CHECK_FOR_INTERRUPTS();
pg_usleep(REFORM_WAIT_TIME); /* wait 0.01 sec, then retry */
}
CHECK_FOR_INTERRUPTS();
pg_usleep(REFORM_WAIT_TIME); /* wait 0.01 sec, then retry */
}
return DMS_ERROR;
PG_CATCH();
{
t_thrd.int_cxt.InterruptHoldoffCount = saveInterruptHoldoffCount;
ReleaseResource();
ret = DMS_ERROR;
}
PG_END_TRY();
return ret;
}
/* called on both new primary and all standby nodes to refresh status */