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

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

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

View File

@ -588,6 +588,9 @@ int ServiceDMLProc::Child()
WriteEngine::WriteEngineWrapper::init(WriteEngine::SUBSYSTEM_ID_DMLPROC);
// Initialize the charset library
MY_INIT("DMLProc");
//@Bug 1627
try
{
@ -607,6 +610,10 @@ int ServiceDMLProc::Child()
cerr << "DMLProc failed to start due to : " << e.what() << endl;
NotifyServiceInitializationFailed();
// Free up resources allocated by MY_INIT() above.
my_end(0);
return 1;
}
@ -666,6 +673,9 @@ int ServiceDMLProc::Child()
_exit(dmlserver.start());
// Free up resources allocated by MY_INIT() above.
my_end(0);
return 1;
}
@ -678,9 +688,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*>("DMLProc");
// Initialize the charset library
MY_INIT(argv[0]);
return ServiceDMLProc(opt).Run();
}