From 93a5d2cefbfc824b479176a6b5453e55c00e291a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?= Date: Mon, 1 Apr 2024 16:55:00 +0200 Subject: [PATCH] Add missing Admin mutex locking during server discovery Right now we lock on Admin everytime we are adding discovered servers. This prevents concurrent configuration modifications, and also ensures consistency during configuration promotions. In the future this locking *may become* not necessary. --- lib/MySQL_HostGroups_Manager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp index 7c188c136..b185416af 100644 --- a/lib/MySQL_HostGroups_Manager.cpp +++ b/lib/MySQL_HostGroups_Manager.cpp @@ -8595,6 +8595,8 @@ void MySQL_HostGroups_Manager::add_discovered_servers_to_mysql_servers_and_repli const vector>& new_servers ) { int added_new_server = -1; + + GloAdmin->mysql_servers_wrlock(); wrlock(); // Add the discovered server with default values @@ -8657,4 +8659,5 @@ void MySQL_HostGroups_Manager::add_discovered_servers_to_mysql_servers_and_repli } wrunlock(); + GloAdmin->mysql_servers_wrunlock(); }