ENGCOM-6253: Fix issue #22240: Running cron jobs fails if database name is too long #25472

Author: VladimirZaets

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

@@ -11,8 +11,8 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Phrase;
+use Magento\Framework\DB\ExpressionConverter;
 
 /**
  * Implementation of the lock manager on the basis of MySQL.
@@ -68,7 +68,6 @@ public function __construct(
      * @param string $name lock name
      * @param int $timeout How long to wait lock acquisition in seconds, negative value means infinite timeout
      * @return bool
-     * @throws InputException
      * @throws AlreadyExistsException
      * @throws \Zend_Db_Statement_Exception
      */
@@ -110,7 +109,6 @@ public function lock(string $name, int $timeout = -1): bool
      *
      * @param string $name lock name
      * @return bool
-     * @throws InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function unlock(string $name): bool
@@ -138,7 +136,6 @@ public function unlock(string $name): bool
      *
      * @param string $name lock name
      * @return bool
-     * @throws InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function isLocked(string $name): bool
@@ -162,15 +159,11 @@ public function isLocked(string $name): bool
      *
      * @param string $name
      * @return string
-     * @throws InputException
      */
     private function addPrefix(string $name): string
     {
-        $name = $this->getPrefix() . '|' . $name;
-
-        if (strlen($name) > 64) {
-            throw new InputException(new Phrase('Lock name too long: %1...', [substr($name, 0, 64)]));
-        }
+        $prefix = $this->getPrefix() ? $this->getPrefix() . '|' : '';
+        $name = ExpressionConverter::shortenEntityName($prefix . $name, $prefix);
 
         return $name;
     }

lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php

@@ -86,7 +86,6 @@ protected function setUp()
 
     /**
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testLock()
@@ -104,22 +103,23 @@ public function testLock()
 
     /**
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
-     * @expectedException \Magento\Framework\Exception\InputException
      */
     public function testlockWithTooLongName()
     {
         $this->deploymentConfig
             ->method('isDbAvailable')
             ->with()
             ->willReturn(true);
-        $this->database->lock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu');
+            $this->statement->expects($this->once())
+            ->method('fetchColumn')
+            ->willReturn(true);
+
+        $this->assertTrue($this->database->lock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu'));
     }
 
     /**
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      * @expectedException \Magento\Framework\Exception\AlreadyExistsException
      */
@@ -139,7 +139,6 @@ public function testlockWithAlreadyAcquiredLockInSameSession()
 
     /**
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testLockWithUnavailableDeploymentConfig()
@@ -153,7 +152,6 @@ public function testLockWithUnavailableDeploymentConfig()
     }
 
     /**
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testUnlockWithUnavailableDeploymentConfig()
@@ -167,7 +165,6 @@ public function testUnlockWithUnavailableDeploymentConfig()
     }
 
     /**
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testIsLockedWithUnavailableDB()