Merge branch 'MDL-76865-master' of https://github.com/daledavies/moodle

2023-09-06 14:48:15 +08:00
parent aa7f105139 af91ae626a
commit 4fa5a40f34
1 changed files with 2 additions and 1 deletions
@@ -621,7 +621,8 @@ class cache implements cache_loader {
        // store; parent method will have set it to all stores if needed.
        if ($setaftervalidation) {
            $lock = null;
-            if (!empty($this->requirelockingbeforewrite)) {
+            // Only try to acquire a lock for this cache if we do not already have one.
+            if (!empty($this->requirelockingbeforewrite) && !$this->check_lock_state($key)) {
                $lock = $this->acquire_lock($key);
            }
            if ($requiredversion === self::VERSION_NONE) {