From 7e6f1ef9bbf79ff8161ce70f05bfd2d105a0d13e Mon Sep 17 00:00:00 2001 From: zhenjinyang Date: Fri, 24 May 2024 17:13:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=89=E8=B5=B7=E4=B8=BB?= =?UTF-8?q?=E5=A4=87=E6=9C=BAtpcc=E4=B8=9A=E5=8A=A1=20kill=E5=A4=87?= =?UTF-8?q?=E6=9C=BA=E8=BF=9B=E7=A8=8B=20=E4=B8=BB=E6=9C=BA=E5=81=B6?= =?UTF-8?q?=E7=8E=B0core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/ddes/adapter/ss_reform_common.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gausskernel/ddes/adapter/ss_reform_common.cpp b/src/gausskernel/ddes/adapter/ss_reform_common.cpp index 128b384f03..04a9a9c2da 100644 --- a/src/gausskernel/ddes/adapter/ss_reform_common.cpp +++ b/src/gausskernel/ddes/adapter/ss_reform_common.cpp @@ -594,13 +594,17 @@ void SSWaitStartupExit(bool send_signal) ereport(WARNING, (errmodule(MOD_DMS), errmsg("[SS reform] reform failed"))); } - +#ifdef USE_ASSERT_CHECKING + ereport(LOG, (errmodule(MOD_DMS), + errmsg("[SS reform] wait for the startup thread to exit"))); +#else long rto_limit = SS_RTO_LIMIT; ereport(LOG, (errmodule(MOD_DMS), errmsg("[SS reform] wait startup thread exit until RTO limit time:%d sec", rto_limit / (1000 * 1000)))); long wait_time = 0; +#endif while (true) { if (g_instance.pid_cxt.StartupPID == 0) { break; @@ -612,11 +616,13 @@ void SSWaitStartupExit(bool send_signal) "during recovery phase, need exit"))); _exit(0); } +#ifndef USE_ASSERT_CHECKING if (wait_time > rto_limit) { SSProcessForceExit(); } - pg_usleep(REFORM_WAIT_TIME); wait_time += REFORM_WAIT_TIME; +#endif + pg_usleep(REFORM_WAIT_TIME); } } -- Gitee