MAGETWO-98151: Add support ZooKeeper locks

Author: BaDos

dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php

@@ -74,6 +74,7 @@ public function testLockAndUnlock()
 
         $this->assertTrue($this->model->lock($name));
         $this->assertTrue($this->model->isLocked($name));
+        $this->assertFalse($this->model->lock($name, 2));
 
         $this->assertTrue($this->model->unlock($name));
         $this->assertFalse($this->model->isLocked($name));

lib/internal/Magento/Framework/Lock/LockBackendFactory.php

@@ -90,7 +90,7 @@ public function create(): LockManagerInterface
         $config = $this->deploymentConfig->get('lock/config', []);
 
         if (!isset($this->lockers[$provider])) {
-            throw new RuntimeException(new Phrase('Unknown locks provider.'));
+            throw new RuntimeException(new Phrase('Unknown locks provider: %1', [$provider]));
         }
 
         if (self::LOCK_ZOOKEEPER === $provider && !extension_loaded(self::LOCK_ZOOKEEPER)) {

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

@@ -13,11 +13,6 @@
 
 class ZookeeperTest extends TestCase
 {
-    /**
-     * @var \Zookeeper|MockObject
-     */
-    private $zookeeperMock;
-
     /**
      * @var ZookeeperProvider
      */
@@ -41,15 +36,23 @@ protected function setUp()
         if (!extension_loaded('zookeeper')) {
             $this->markTestSkipped('Test was skipped because php extension Zookeeper is not installed.');
         }
-        $this->zookeeperProvider = new ZookeeperProvider($this->host, '/some/path/');
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\RuntimeException
      * @expectedExceptionMessage The path needs to be a non-empty string.
+     * @return void
      */
     public function testConstructionWithException()
     {
-        $this->zookeeperProvider = new ZookeeperProvider('some host', '');
+        $this->zookeeperProvider = new ZookeeperProvider($this->host, '');
+    }
+
+    /**
+     * @return void
+     */
+    public function testConstructionWithoutException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider($this->host, $this->path);
     }
 }

lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php

@@ -46,7 +46,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\RuntimeException
-     * @expectedExceptionMessage Unknown locks provider.
+     * @expectedExceptionMessage Unknown locks provider: someProvider
      */
     public function testCreateWithException()
     {

setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php

@@ -210,12 +210,12 @@ private function validateZookeeperConfig(array $options, DeploymentConfig $deplo
             $errors[] = 'php extension Zookeeper is not installed.';
         }
 
-        $host = (string) $options[self::INPUT_KEY_LOCK_ZOOKEEPER_HOST]
+        $host = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_HOST]
             ?? $deploymentConfig->get(
                    self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
                    $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_HOST)
                );
-        $path = (string) $options[self::INPUT_KEY_LOCK_ZOOKEEPER_PATH]
+        $path = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_PATH]
             ?? $deploymentConfig->get(
                 self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
                 $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_PATH)