L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-69684-M403_its-possible-to-hold-a-redis-session-lock-forever' of https://github.com/ziegenberg/moodle into MOODLE_403_STABLE

Browse Source
This commit is contained in:
Huong Nguyen
2024-08-26 10:58:13 +07:00
parent cd08a0ecee 3460632bf1
commit 55f37d0dc7
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/session/redis.php
+22 -7
View File
@@ -53,6 +53,15 @@ class redis extends handler {
*/
const COMPRESSION_ZSTD = 'zstd';
/**
* Minimum version of the Redis extension required.
*/
private const REDIS_EXTENSION_MIN_VERSION = '2.2.4';
/**
* Minimum version of the Redis extension required.
*/
private const REDIS_SERVER_MIN_VERSION = '2.6.12';
/** @var string $host save_path string */
protected $host = '';
/** @var int $port The port to connect to */
@@ -193,13 +202,14 @@ class redis extends handler {
if (empty($this->host)) {
throw new exception('sessionhandlerproblem', 'error', '', null,
'$CFG->session_redis_host must be specified in config.php');
'$CFG->session_redis_host must be specified in config.php');
}
// The session handler requires a version of Redis with the SETEX command (at least 2.0).
// The session handler requires a version of PHP Redis extension with support for SET command options (at least 2.2.4).
$version = phpversion('Redis');
if (!$version or version_compare($version, '2.0') <= 0) {
throw new exception('sessionhandlerproblem', 'error', '', null, 'redis extension version must be at least 2.0');
if (!$version || version_compare($version, self::REDIS_EXTENSION_MIN_VERSION) <= 0) {
throw new exception('sessionhandlerproblem', 'error', '', null,
'redis extension version must be at least ' . self::REDIS_EXTENSION_MIN_VERSION);
}
$this->connection = new \Redis();
@@ -265,6 +275,13 @@ class redis extends handler {
throw new RedisException('Unable to select Redis database '.$this->database.'.');
}
}
// The session handler requires a version of Redis server with support for SET command options (at least 2.6.12).
$serverversion = $this->connection->info('server')['redis_version'];
if (version_compare($serverversion, self::REDIS_SERVER_MIN_VERSION) <= 0) {
throw new exception('sessionhandlerproblem', 'error', '', null,
'redis server version must be at least ' . self::REDIS_SERVER_MIN_VERSION);
}
return true;
} catch (RedisException $e) {
$logstring = "Failed to connect (try {$counter} out of {$maxnumberofretries}) to redis ";
@@ -507,12 +524,10 @@ class redis extends handler {
$haswarned = false; // Have we logged a lock warning?
while (!$haslock) {
$haslock = $this->connection->setnx($lockkey, $whoami);
$haslock = $this->connection->set($lockkey, $whoami, ['nx', 'ex' => $this->lockexpire]);
if ($haslock) {
$this->locks[$id] = $this->time() + $this->lockexpire;
$this->connection->expire($lockkey, $this->lockexpire);
return true;
}
lib/upgrade.txt
+1
View File
@@ -10,6 +10,7 @@ information provided here is intended especially for developers.
=== 4.3.6 ===
* Redis session cache has been improved to make a single call where two were used before. The minimum redis version is now 2.6.12.
* The `\core\dataformat::get_format_instance` method is now public, and can be used to retrieve a writer instance for
a given dataformat
* Added the ability for unit tests to autoload classes in the `\[component]\tests\` namespace from the `[path/to/component]/tests/classes` directory.