MDL-76865 core: Check lock state before attempting to acquire a lock

2023-08-14 12:36:45 +01:00
parent b156b18c72
commit ddd260ffa4
1 changed files with 2 additions and 1 deletions
@@ -608,7 +608,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) {