MC-33275: Stale cache implementation

Author: vzabaznov

lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php

@@ -198,39 +198,28 @@ private function removeRemoteDataVersion($id)
     public function load($id, $doNotTestCacheValidity = false)
     {
         $localData = $this->local->load($id);
-        $remoteData = false;
-        $versionCheckFailed = false;
 
-        if (false === $localData) {
-            $remoteData = $this->remote->load($id);
-
-            if (false === $remoteData) {
-                return false;
-            }
-        } else {
-            if ($versionCheckFailed = ($this->getDataVersion($localData) !== $this->loadRemoteDataVersion($id))) {
-                $remoteData = $this->remote->load($id);
-
-                if (!$this->_options['use_stale_cache']) {
-                    $localData = false;
-                }
+        if ($localData) {
+            if ($this->getDataVersion($localData) === $this->loadRemoteDataVersion($id)) {
+                return $localData;
             }
         }
 
-        if ($remoteData !== false) {
+        $remoteData = $this->remote->load($id);
+        if ($remoteData) {
             $this->local->save($remoteData, $id);
-            $localData = $remoteData;
-        } elseif ($this->_options['use_stale_cache'] && $localData !== false && $versionCheckFailed) {
+
+            return $remoteData;
+        } elseif ($localData && $this->_options['use_stale_cache']) {
             if ($this->lock($id)) {
                 return false;
             } else {
-                $this->notifier = $this->notifier ??
-                    ObjectManager::getInstance()->get(CompositeStaleCacheNotifier::class);
-                $this->notifier->cacheLoaderIsUsingStaleCache();
+                $this->notifyStaleCache();
+                return $localData;
             }
         }
 
-        return $localData;
+        return false;
     }
 
     /**
@@ -424,7 +413,7 @@ private function getLockName($id): string
      */
     private function unlockAll()
     {
-        foreach ($this->lockList as $id => $ttl) {
+        foreach ($this->lockList as $id) {
             $this->unlock($id);
         }
     }
@@ -461,4 +450,11 @@ private function generateLockSign()
 
         return $sign;
     }
+
+    private function notifyStaleCache(): void
+    {
+        $this->notifier = $this->notifier ??
+            ObjectManager::getInstance()->get(CompositeStaleCacheNotifier::class);
+        $this->notifier->cacheLoaderIsUsingStaleCache();
+    }
 }

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

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Setup\Model\ConfigOptionsList;
 

setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Setup\Test\Unit\Model\ConfigOptionsList;
 
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Setup\Option\FlagConfigOption;
 use Magento\Framework\Setup\Option\SelectConfigOption;
 use Magento\Framework\Setup\Option\TextConfigOption;
 use Magento\Setup\Model\ConfigOptionsList\Cache as CacheConfigOptionsList;
@@ -48,7 +49,7 @@ protected function setUp(): void
     public function testGetOptions()
     {
         $options = $this->configOptionsList->getOptions();
-        $this->assertCount(8, $options);
+        $this->assertCount(9, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -81,6 +82,10 @@ public function testGetOptions()
         $this->assertArrayHasKey(7, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[7]);
         $this->assertEquals('cache-id-prefix', $options[7]->getName());
+
+        $this->assertArrayHasKey(8, $options);
+        $this->assertInstanceOf(FlagConfigOption::class, $options[8]);
+        $this->assertEquals('allow-parallel-generation', $options[8]->getName());
     }
 
     /**
@@ -105,11 +110,13 @@ public function testCreateConfigCacheRedis()
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
-                ]
+                ],
+                'allow_parallel_generation' => '',
             ]
         ];
 
-        $configData = $this->configOptionsList->createConfig(['cache-backend'=>'redis'], $this->deploymentConfigMock);
+        $configData = $this->configOptionsList
+            ->createConfig(['cache-backend' => 'redis'], $this->deploymentConfigMock);
 
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
@@ -134,7 +141,8 @@ public function testCreateConfigWithRedisConfig()
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
-                ]
+                ],
+                'allow_parallel_generation' => null,
             ]
         ];
 
@@ -211,7 +219,7 @@ public function testValidateWithValidInput()
         ];
         $this->validatorMock->expects($this->once())
             ->method('isValidConnection')
-            ->with(['host'=>'localhost', 'db'=>'', 'port'=>'', 'password'=>''])
+            ->with(['host' => 'localhost', 'db' => '', 'port' => '', 'password' => ''])
             ->willReturn(true);
 
         $errors = $this->configOptionsList->validate($options, $this->deploymentConfigMock);