Add DB name as lock prefix

Author: paveq

lib/internal/Magento/Framework/Lock/Backend/Database.php

@@ -7,7 +7,9 @@
 declare(strict_types=1);
 namespace Magento\Framework\Lock\Backend;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Phrase;
 
@@ -16,10 +18,20 @@ class Database implements \Magento\Framework\Lock\LockManagerInterface
     /** @var ResourceConnection */
     private $resource;
 
+    /** @var DeploymentConfig */
+    private $deploymentConfig;
+
+    /** @var string Lock prefix */
+    private $prefix;
+
     public function __construct(
-        ResourceConnection $resource
+        ResourceConnection $resource,
+        DeploymentConfig $deploymentConfig,
+        string $prefix = null
     ) {
         $this->resource = $resource;
+        $this->deploymentConfig = $deploymentConfig;
+        $this->prefix = $prefix;
     }
 
     /**
@@ -32,7 +44,7 @@ public function __construct(
      */
     public function acquireLock(string $name, int $timeout = -1): bool
     {
-        $this->checkLength($name);
+        $name = $this->addPrefix($name);
 
         return (bool)$this->resource->getConnection()->query("SELECT GET_LOCK(?, ?);", [(string)$name, (int)$timeout])
             ->fetchColumn();
@@ -47,7 +59,7 @@ public function acquireLock(string $name, int $timeout = -1): bool
      */
     public function releaseLock(string $name): bool
     {
-        $this->checkLength($name);
+        $name = $this->addPrefix($name);
 
         return (bool)$this->resource->getConnection()->query("SELECT RELEASE_LOCK(?);", [(string)$name])->fetchColumn();
     }
@@ -61,23 +73,45 @@ public function releaseLock(string $name): bool
      */
     public function isLocked(string $name): bool
     {
-        $this->checkLength($name);
+        $name = $this->addPrefix($name);
 
         return (bool)$this->resource->getConnection()->query("SELECT IS_USED_LOCK(?);", [(string)$name])->fetchColumn();
     }
 
     /**
-     * Checks for max length of lock name
+     * Adds prefix and checks for max length of lock name
      *
      * Limited to 64 characters in MySQL.
      *
      * @param string $name
+     * @return string $name
      * @throws InputException
      */
-    private function checkLength(string $name)
+    private function addPrefix(string $name): string
     {
+        $name = $this->getPrefix() . '|' . $name;
+
         if (strlen($name) > 64) {
             throw new InputException(new Phrase('Lock name too long'));
         }
+
+        return $name;
+    }
+
+    /**
+     * Get installation specific lock prefix to avoid lock conflicts
+     *
+     * @return string lock prefix
+     */
+    private function getPrefix(): string
+    {
+        if ($this->prefix === null) {
+            $this->prefix = $this->deploymentConfig->get(
+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT . '/' . ConfigOptionsListConstants::KEY_NAME,
+                ''
+            );
+        }
+
+        return $this->prefix;
     }
 }