From a083b489970a2b4dc5b06f3d88552155d1d688d6 Mon Sep 17 00:00:00 2001 From: maxiang Date: Fri, 19 Mar 2021 12:35:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20src/gausskernel/process/postmaster?= =?UTF-8?q?/postmaster.cpp.=20=E8=A7=A3=E5=86=B3switchover=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=BB=E6=9C=BA=E4=B8=80=E7=9B=B4demoting=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/process/postmaster/postmaster.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gausskernel/process/postmaster/postmaster.cpp b/src/gausskernel/process/postmaster/postmaster.cpp index 19c162859..66c9a8433 100755 --- a/src/gausskernel/process/postmaster/postmaster.cpp +++ b/src/gausskernel/process/postmaster/postmaster.cpp @@ -4058,9 +4058,6 @@ static void SIGHUP_handler(SIGNAL_ARGS) if ( #ifdef ENABLE_MULTIPLE_NODES IS_PGXC_COORDINATOR && -#else - (t_thrd.postmaster_cxt.HaShmData->current_mode == NORMAL_MODE || - t_thrd.postmaster_cxt.HaShmData->current_mode == PRIMARY_MODE) && #endif g_instance.pid_cxt.TwoPhaseCleanerPID != 0) signal_child(g_instance.pid_cxt.TwoPhaseCleanerPID, SIGHUP); @@ -4644,6 +4641,9 @@ static void ProcessDemoteRequest(void) Assert(!dummyStandbyMode); signal_child(g_instance.pid_cxt.BgWriterPID, SIGTERM); } + if (g_instance.pid_cxt.TwoPhaseCleanerPID != 0) + signal_child(g_instance.pid_cxt.TwoPhaseCleanerPID, SIGTERM); + /* and the walwriter too */ if (g_instance.pid_cxt.WalWriterPID != 0) signal_child(g_instance.pid_cxt.WalWriterPID, SIGTERM); @@ -4715,6 +4715,9 @@ static void ProcessDemoteRequest(void) if (g_instance.pid_cxt.HeartbeatPID != 0) signal_child(g_instance.pid_cxt.HeartbeatPID, SIGTERM); + if (g_instance.pid_cxt.TwoPhaseCleanerPID != 0) + signal_child(g_instance.pid_cxt.TwoPhaseCleanerPID, SIGTERM); + if (g_instance.pid_cxt.WLMCollectPID != 0) { WLMProcessThreadShutDown(); signal_child(g_instance.pid_cxt.WLMCollectPID, SIGTERM); @@ -5564,9 +5567,6 @@ static void reaper(SIGNAL_ARGS) if ( #ifdef ENABLE_MULTIPLE_NODES IS_PGXC_COORDINATOR && -#else - (t_thrd.postmaster_cxt.HaShmData->current_mode == NORMAL_MODE || - t_thrd.postmaster_cxt.HaShmData->current_mode == PRIMARY_MODE) && #endif pid == g_instance.pid_cxt.TwoPhaseCleanerPID) { g_instance.pid_cxt.TwoPhaseCleanerPID = 0; From 6f77f5f0b255a5bb5bb8ad4a3b68a59209dabbfb Mon Sep 17 00:00:00 2001 From: maxiang Date: Fri, 19 Mar 2021 12:37:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20src/gausskernel/process/postmaster?= =?UTF-8?q?/twophasecleaner.cpp.=20=E8=A7=A3=E5=86=B3switchover=EF=BC=8C?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E4=B8=80=E7=9B=B4demoting=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/process/postmaster/twophasecleaner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gausskernel/process/postmaster/twophasecleaner.cpp b/src/gausskernel/process/postmaster/twophasecleaner.cpp index f8f4bb5d2..45b56753c 100644 --- a/src/gausskernel/process/postmaster/twophasecleaner.cpp +++ b/src/gausskernel/process/postmaster/twophasecleaner.cpp @@ -175,7 +175,7 @@ NON_EXEC_STATIC void TwoPhaseCleanerMain() rc = sprintf_s(cmd, sizeof(cmd), "gs_clean -a -p %d -e -v -r -j %d > /dev/null 2>&1", - g_instance.attr.attr_network.PoolerPort, + g_instance.attr.attr_network.PostPortNumber, u_sess->attr.attr_storage.twophase_clean_workers); securec_check_ss(rc, "\0", "\0"); #endif