mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 03:09:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #2333 avoid deadlock while waiting for user_cache rebuild

Browse source
This commit is contained in:
plegall 2025-03-01 12:04:23 +01:00
parent 6489dceadf
commit 5eacda0d76
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/functions.inc.php
View file

@ -2881,6 +2881,19 @@ INSERT IGNORE
return $exec_id; return $exec_id;
} }
function pwg_unique_exec_is_running($token_name)
{
$query = '
SELECT
COUNT(*)
FROM '.CONFIG_TABLE.'
WHERE param = "'.$token_name.'_running"
;';
list($counter) = pwg_db_fetch_row(pwg_query($query));
return $counter > 0;
}
function pwg_unique_exec_ends($token_name) function pwg_unique_exec_ends($token_name)
{ {
conf_delete_param($token_name.'_running'); conf_delete_param($token_name.'_running');

10
include/functions_user.inc.php
View file

@ -437,15 +437,21 @@ SELECT
list($nb_cache_lines) = pwg_db_fetch_row(pwg_query($query)); list($nb_cache_lines) = pwg_db_fetch_row(pwg_query($query));
$logger_msg = $logger_msg_prefix.'user_cache generation waiting k='.$k.' '; $logger_msg = $logger_msg_prefix.'user_cache generation waiting k='.$k.' ';
$waiting_time = get_elapsed_time($user_cache_waiting_start_time, get_moment());
if ($nb_cache_lines > 0) if ($nb_cache_lines > 0)
{ {
$logger->info($logger_msg.'user_cache rebuilt, after waiting '.get_elapsed_time($user_cache_waiting_start_time, get_moment())); $logger->info($logger_msg.'user_cache rebuilt, after waiting '.$waiting_time);
return getuserdata($user_id, false); return getuserdata($user_id, false);
} }
elseif (!pwg_unique_exec_is_running($cache_generation_token_name))
{
$logger->info($logger_msg.'user_cache rebuilt but has been reset since, give it another try, after waiting '.$waiting_time);
return getuserdata($user_id, true);
}
else else
{ {
$logger->info($logger_msg.'user_cache not ready yet, after waiting '.get_elapsed_time($user_cache_waiting_start_time, get_moment())); $logger->info($logger_msg.'user_cache not ready yet, after waiting '.$waiting_time);
} }
} }