MAGECLOUD-1582: The "disable_locking" parameter breaks 2.2.0 and doesn't required in >=2.2.2 (#151)

Author: oshmyheliuk

src/Config/Stage/Deploy.php

@@ -111,7 +111,6 @@ private function getEnvironmentConfig(): array
         }
 
         $disabledFlow = [
-            self::VAR_REDIS_SESSION_DISABLE_LOCKING,
             self::VAR_CLEAN_STATIC_FILES,
             self::VAR_STATIC_CONTENT_SYMLINK,
             self::VAR_UPDATE_URLS,
@@ -167,7 +166,6 @@ private function getDefault(): array
         return [
             self::VAR_SCD_STRATEGY => '',
             self::VAR_SCD_COMPRESSION_LEVEL => 4,
-            self::VAR_REDIS_SESSION_DISABLE_LOCKING => true,
             self::VAR_SEARCH_CONFIGURATION => [],
             self::VAR_QUEUE_CONFIGURATION => [],
             self::VAR_VERBOSE_COMMANDS => '',

src/Config/Stage/DeployInterface.php

@@ -14,7 +14,6 @@ interface DeployInterface extends StageConfigInterface
 {
     const VAR_QUEUE_CONFIGURATION = 'QUEUE_CONFIGURATION';
     const VAR_SEARCH_CONFIGURATION = 'SEARCH_CONFIGURATION';
-    const VAR_REDIS_SESSION_DISABLE_LOCKING = 'REDIS_SESSION_DISABLE_LOCKING';
     const VAR_CRON_CONSUMERS_RUNNER = 'CRON_CONSUMERS_RUNNER';
     const VAR_CLEAN_STATIC_FILES = 'CLEAN_STATIC_FILES';
     const VAR_STATIC_CONTENT_SYMLINK = 'STATIC_CONTENT_SYMLINK';

src/Process/Deploy/InstallUpdate/ConfigUpdate/Redis.php

@@ -96,7 +96,6 @@ public function execute()
                 'host' => $redisConfig[0]['host'],
                 'port' => $redisConfig[0]['port'],
                 'database' => 0,
-                'disable_locking' => (int)$this->isLockingDisabled(),
             ];
             $config['session'] = [
                 'save' => 'redis',
@@ -139,16 +138,4 @@ private function removeRedisConfiguration($config)
 
         return $config;
     }
-
-    /**
-     * Checks if disable_locking options is enabled.
-     * By default this method returns true and disable_locking options will be set to 1.
-     * For turning this option off environment variable 'REDIS_SESSION_DISABLE_LOCKING' should have value 'disabled'.
-     *
-     * @return bool
-     */
-    private function isLockingDisabled(): bool
-    {
-        return $this->stageConfig->get(DeployInterface::VAR_REDIS_SESSION_DISABLE_LOCKING);
-    }
 }

src/Test/Unit/Config/Stage/DeployTest.php

@@ -141,14 +141,6 @@ public function getDataProvider(): array
                 [],
                 '{"SOME_CONFIG": "some value',
             ],
-            'disabled flow 1' => [
-                Deploy::VAR_REDIS_SESSION_DISABLE_LOCKING,
-                [],
-                [
-                    Deploy::VAR_REDIS_SESSION_DISABLE_LOCKING => EnvironmentConfig::VAL_DISABLED,
-                ],
-                false,
-            ],
             'disabled flow 2' => [
                 Deploy::VAR_UPDATE_URLS,
                 [],

src/Test/Unit/Process/Deploy/InstallUpdate/ConfigUpdate/RedisTest.php

@@ -73,12 +73,7 @@ protected function setUp()
         );
     }
 
-    /**
-     * @param $envSessionLocking
-     * @param int $expectedDisableLocking
-     * @dataProvider executeDataProvider
-     */
-    public function testExecute($envSessionLocking, int $expectedDisableLocking)
+    public function testExecute()
     {
         $this->loggerMock->expects($this->once())
             ->method('info')
@@ -96,10 +91,6 @@ public function testExecute($envSessionLocking, int $expectedDisableLocking)
         $this->environmentMock->expects($this->any())
             ->method('getAdminUrl')
             ->willReturn('admin');
-        $this->stageConfigMock->expects($this->once())
-            ->method('get')
-            ->with(DeployInterface::VAR_REDIS_SESSION_DISABLE_LOCKING)
-            ->willReturn($envSessionLocking);
         $this->configReaderMock->expects($this->once())
             ->method('read')
             ->willReturn([]);
@@ -133,35 +124,13 @@ public function testExecute($envSessionLocking, int $expectedDisableLocking)
                         'host' => '127.0.0.1',
                         'port' => '6379',
                         'database' => 0,
-                        'disable_locking' => $expectedDisableLocking,
                     ],
                 ],
             ]);
 
         $this->process->execute();
     }
 
-    /**
-     * @return array
-     */
-    public function executeDataProvider(): array
-    {
-        return [
-            [
-                true,
-                1,
-            ],
-            [
-                false,
-                0,
-            ],
-            [
-                true,
-                1,
-            ],
-        ];
-    }
-
     public function testExecuteRemovingRedis()
     {
         $this->loggerMock->expects($this->once())
@@ -239,10 +208,6 @@ public function testExecuteWithDifferentRedisOptions()
         $this->environmentMock->expects($this->any())
             ->method('getAdminUrl')
             ->willReturn('admin');
-        $this->stageConfigMock->expects($this->once())
-            ->method('get')
-            ->with(DeployInterface::VAR_REDIS_SESSION_DISABLE_LOCKING)
-            ->willReturn(true);
         $this->configReaderMock->expects($this->once())
             ->method('read')
             ->willReturn([
@@ -286,7 +251,6 @@ public function testExecuteWithDifferentRedisOptions()
                         'host' => '127.0.0.1',
                         'port' => '6379',
                         'database' => 0,
-                        'disable_locking' => 1,
                         'max_concurrency' => 10,
                         'bot_first_lifetime' => 100,
                         'bot_lifetime' => 10000,