mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 19:50:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-70687_default-redis-session-lock-expiration-to-php-execution-time' of https://github.com/ziegenberg/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2023-03-21 11:39:25 +08:00 committed by Sara Arjona
commit d001dd43ca
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/classes/session/redis.php
View File

@ -139,7 +139,23 @@ class redis extends handler {
$updatefreq = empty($CFG->session_update_timemodified_frequency) ? 20 : $CFG->session_update_timemodified_frequency;
$this->timeout = $CFG->sessiontimeout + $updatefreq + MINSECS;
$this->lockexpire = $CFG->sessiontimeout;
// This sets the Redis session lock expiry time to whatever is lower, either
// the PHP execution time `max_execution_time`, if the value was defined in
// the `php.ini` or the globally configured `sessiontimeout`. Setting it to
// the lower of the two will not make things worse it if the execution timeout
// is longer than the session timeout.
// For the PHP execution time, once the PHP execution time is over, we can be sure
// that the lock is no longer actively held so that the lock can expire safely.
// Although at `lib/classes/php_time_limit.php::raise(int)`, Moodle can
// progressively increase the maximum PHP execution time, this is limited to the
// `max_execution_time` value defined in the `php.ini`.
// For the session timeout, we assume it is safe to consider the lock to expire
// once the session itself expires.
// If we unnecessarily hold the lock any longer, it blocks other session requests.
$this->lockexpire = ini_get('max_execution_time');
if (empty($this->lockexpire) || ($this->lockexpire > (int)$CFG->sessiontimeout)) {
$this->lockexpire = (int)$CFG->sessiontimeout;
}
if (isset($CFG->session_redis_lock_expire)) {
$this->lockexpire = (int)$CFG->session_redis_lock_expire;
}