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

fix threadpool

Browse Source
This commit is contained in:
LiHeng
2021-08-04 16:48:04 +08:00
parent 0cd52e3783
commit f09db307e1
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gausskernel/process/threadpool/threadpool_worker.cpp
View File

@ -396,6 +396,13 @@ void ThreadPoolWorker::ShutDownIfNecessary()
RestoreThreadVariable();
proc_exit(0);
}
/* there is time window which the cancle signal has arrived but ignored by prevent signal called before,
* so we rebuild the signal status here in case that happens. */
if (unlikely(m_currentSession != NULL && m_currentSession->status == KNL_SESS_CLOSE)) {
ereport(LOG, (errmodule(MOD_THREAD_POOL),
errmsg("Cancle signal has arrived but ignored by prevent signal called before, rebuild it.")));
t_thrd.int_cxt.ClientConnectionLost = true;
}
}
void ThreadPoolWorker::CleanThread()
@ -425,6 +432,7 @@ void ThreadPoolWorker::CleanThread()
}
InterruptPending = false;
t_thrd.int_cxt.QueryCancelPending = false;
t_thrd.libpq_cxt.PqSendStart = 0;
t_thrd.libpq_cxt.PqSendPointer = 0;
t_thrd.libpq_cxt.PqRecvLength = 0;
@ -494,8 +502,16 @@ bool ThreadPoolWorker::AttachSessionToThread()
* Since thread pool worker may start earlier than startup finishing recovery,
* init xlog access if necessary.
*/
(void)RecoveryInProgress();
PG_TRY();
{
(void)RecoveryInProgress();
}
PG_CATCH();
{
/* if init xlog has error, should throw fatal this thread */
ereport(FATAL, (errmsg("init xlog failed, throw fatal for this thread")));
}
PG_END_TRY();
#ifdef ENABLE_QUNIT
set_qunit_case_number_hook(u_sess->utils_cxt.qunit_case_number, NULL);
#endif
@ -660,6 +676,8 @@ static void init_session_share_memory()
static bool InitSession(knl_session_context* session)
{
/* non't send ereport to client now */
t_thrd.postgres_cxt.whereToSendOutput = DestNone;
/* Switch context to Session context. */
AutoContextSwitch memSwitch(session->mcxt_group->GetMemCxtGroup(MEMORY_CONTEXT_DEFAULT));
@ -682,6 +700,9 @@ static bool InitSession(knl_session_context* session)
/* Read in remaining GUC variables */
read_nondefault_variables();
/* now safe to ereport to client */
t_thrd.postgres_cxt.whereToSendOutput = DestRemote;
/* Init port and connection. */
if (!InitPort(session->proc_cxt.MyProcPort)) {
/* reset some status below */