database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix race condition: instance map wasn't locked for the

Browse Source 
duration of the whole 'flush instances'. As a consequence,
it was possible to query instance map, while it is in the
inconsistent state. The patch was reworked after review.
This commit is contained in:
petr@mysql.com
2006-02-21 15:57:56 +03:00
parent 0766fb3a53
commit cb5e54e1bd
4 changed files with 85 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server-tools/instance-manager/manager.cc
View File

@ -135,15 +135,6 @@ void manager(const Options &options)
if (instance_map.init() || user_map.init())
return;
if (instance_map.load())
{
log_error("Cannot init instances repository. This might be caused by "
"the wrong config file options. For instance, missing mysqld "
"binary. Aborting.");
return;
}
if (user_map.load(options.password_file_name))
return;
@ -207,12 +198,13 @@ void manager(const Options &options)
shutdown_complete= FALSE;
/* init list of guarded instances */
guardian_thread.lock();
guardian_thread.init();
guardian_thread.unlock();
if (instance_map.flush_instances())
{
log_error("Cannot init instances repository. This might be caused by "
"the wrong config file options. For instance, missing mysqld "
"binary. Aborting.");
return;
}
/*
After the list of guarded instances have been initialized,