database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Fix resource leak in DDLProc/DMLProc/PrimProc/WriteengineServer processes.

Browse Source 
As part of the charset support, a call to MY_INIT() was added at the
initialization of the above processes. This call initializes the MySQL
thread environment required by the charset library. However, the
accompanying my_end() call required to terminate this thread environment
was not added at the termination of these process, hence leaking
resources. As a fix, we move the MY_INIT() calls to the Child()
functions of these services and also add the missing my_end() call.
This commit is contained in:
Gagan Goel
2023-06-22 15:53:04 +00:00
parent 5342234f15
commit 101aa079ab
4 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
primitives/primproc/primproc.cpp
View File

@ -299,6 +299,9 @@ int ServicePrimProc::Child()
int err = 0;
err = setupCwd(cf);
// Initialize the charset library
MY_INIT("PrimProc");
mlp = new primitiveprocessor::Logger();
if (!m_debug)
@ -328,6 +331,10 @@ int ServicePrimProc::Child()
cerr << errMsg << endl;
NotifyServiceInitializationFailed();
// Free up resources allocated by MY_INIT() above.
my_end(0);
return 2;
}
utils::USpaceSpinLock startupRaceLock(getStartupRaceFlag());
@ -693,6 +700,9 @@ int ServicePrimProc::Child()
cerr << "server.start() exited!" << endl;
// Free up resources allocated by MY_INIT() above.
my_end(0);
return 1;
}
@ -709,8 +719,6 @@ int main(int argc, char** argv)
setlocale(LC_NUMERIC, "C");
// This is unset due to the way we start it
program_invocation_short_name = const_cast<char*>("PrimProc");
// Initialize the charset library
MY_INIT(argv[0]);
ServicePrimProc::instance()->setOpt(opt);
return ServicePrimProc::instance()->Run();