MAGETWO-98151: Add support ZooKeeper locks

Author: BaDos

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

@@ -84,12 +84,18 @@ class Zookeeper implements LockManagerInterface
      */
     public function __construct(string $host, string $path = self::DEFAULT_PATH)
     {
-        if (empty($path)) {
+        if (!$path) {
             throw new RuntimeException(
                 new Phrase('The path needs to be a non-empty string.')
             );
         }
 
+        if (!$host) {
+            throw new RuntimeException(
+                new Phrase('The host needs to be a non-empty string.')
+            );
+        }
+
         $this->host = $host;
         $this->path = preg_replace('#\/*$#', '', $path) ?: '/';
     }
@@ -221,18 +227,18 @@ private function checkAndCreateParentNode(string $path): bool
      */
     private function getIndex(string $key)
     {
-        if (!preg_match("/[0-9]+$/", $key, $matches))
+        if (!preg_match('/' . $this->lockName . '([0-9]+)$/', $key, $matches))
             return null;
 
-        return intval($matches[0]);
+        return intval($matches[1]);
     }
 
     /**
      * Checks if there is any sequence node under parent of $fullKey.
      * At first checks that the $fullKey node is present, if not - returns false.
      *
-     * If $indexKey is non-null and there is a smaller index that $indexKey then returns true,
-     * if all the nodes are larger than $indexKey then returns false.
+     * If $indexKey is non-null and there is a smaller index than $indexKey then returns true,
+     * otherwise returns false.
      *
      * @param string $fullKey The full path without any sequence info
      * @param int|null $indexKey The index to compare
@@ -249,12 +255,11 @@ private function isAnyLock(string $fullKey, int $indexKey = null): bool
 
         $children = $this->getProvider()->getChildren($parent);
 
-        foreach ($children as $childKey) {
-
-            if (is_null($indexKey)) {
-                return true;
-            }
+        if (is_null($indexKey) && !empty($children)) {
+            return true;
+        }
 
+        foreach ($children as $childKey) {
             $childIndex = $this->getIndex($childKey);
 
             if (is_null($childIndex)) {

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

@@ -43,11 +43,21 @@ protected function setUp()
      * @expectedExceptionMessage The path needs to be a non-empty string.
      * @return void
      */
-    public function testConstructionWithException()
+    public function testConstructionWithPathException()
     {
         $this->zookeeperProvider = new ZookeeperProvider($this->host, '');
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage The host needs to be a non-empty string.
+     * @return void
+     */
+    public function testConstructionWithHostException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider('', $this->path);
+    }
+
     /**
      * @return void
      */

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

@@ -241,7 +241,7 @@ private function validateZookeeperConfig(array $options, DeploymentConfig $deplo
      */
     private function getLockProvider(array $options, DeploymentConfig $deploymentConfig): string
     {
-        if (empty($options[self::INPUT_KEY_LOCK_PROVIDER])) {
+        if (!isset($options[self::INPUT_KEY_LOCK_PROVIDER])) {
             return (string) $deploymentConfig->get(
                 self::CONFIG_PATH_LOCK_PROVIDER,
                 $this->getDefaultValue(self::INPUT_KEY_LOCK_PROVIDER)