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

fix reform timeout due to twophasecleaner and backend term deadlock

Browse Source
This commit is contained in:
bowenliu
2023-09-19 16:41:24 +08:00
parent 15a2bebe54
commit b472eb0cd3
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,9 +389,6 @@ static int CBSwitchoverPromote(void *db_handle, unsigned char origPrimaryId)
if (g_instance.dms_cxt.SSClusterState == NODESTATE_STANDBY_PROMOTED) {
/* flush control file primary id in advance to save new standby's waiting time */
SSSavePrimaryInstId(SS_MY_INST_ID);
SSReadControlFile(REFORM_CTRL_PAGE);
Assert(SSGetPrimaryInstId() == SS_MY_INST_ID);
ereport(LOG, (errmodule(MOD_DMS),
errmsg("[SS switchover] Standby promote: success, set new primary:%d.", SS_MY_INST_ID)));
return DMS_SUCCESS;
@ -429,16 +426,15 @@ static void CBSwitchoverResult(void *db_handle, int result)
static int SetPrimaryIdOnStandby(int primary_id)
{
g_instance.dms_cxt.SSReformerControl.primaryInstId = primary_id;
for (int ntries = 0;; ntries++) {
SSReadControlFile(REFORM_CTRL_PAGE); /* need to double check */
if (g_instance.dms_cxt.SSReformerControl.primaryInstId == primary_id) {
ereport(LOG, (errmodule(MOD_DMS),
errmsg("[SS %s] Reform success, this is a standby:%d confirming new primary:%d.",
SS_PERFORMING_SWITCHOVER ? "switchover" : "reform", SS_MY_INST_ID, primary_id)));
errmsg("[SS %s] Reform success, this is a standby:%d confirming new primary:%d, confirm ntries=%d.",
SS_PERFORMING_SWITCHOVER ? "switchover" : "reform", SS_MY_INST_ID, primary_id, ntries)));
return DMS_SUCCESS;
} else {
SSSavePrimaryInstId(primary_id);
if (ntries >= WAIT_REFORM_CTRL_REFRESH_TRIES) {
ereport(ERROR,
(errmodule(MOD_DMS), errmsg("[SS %s] Failed to confirm new primary: %d,"

7
src/gausskernel/process/postmaster/twophasecleaner.cpp
View File

@ -205,6 +205,12 @@ NON_EXEC_STATIC void TwoPhaseCleanerMain()
if (t_thrd.tpcleaner_cxt.shutdown_requested) {
/* Normal exit from the twophasecleaner is here */
ereport(LOG, (errmsg("TwoPhaseCleaner exits via SIGTERM")));
proc_exit(0);
}
if (SS_PRIMARY_DEMOTING) {
ereport(LOG, (errmsg("TwoPhaseCleaner exits via SS global var")));
proc_exit(0);
}
@ -326,6 +332,7 @@ static void TwoPCShutdownHandler(SIGNAL_ARGS)
{
int save_errno = errno;
ereport(LOG, (errmsg("TwoPhaseCleaner received SIGTERM")));
t_thrd.tpcleaner_cxt.shutdown_requested = true;
if (t_thrd.proc)