ACP2E-684: FPC is indicated as disabled after flushing Magento Cache

- Fixed logic in L2 Cache model

Author: viktym

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

@@ -135,7 +135,7 @@ public function __construct(array $options = [])
      */
     public function setDirectives($directives)
     {
-        return $this->local->setDirectives($directives);
+        $this->remote->setDirectives($directives);
     }
 
     /**
@@ -250,6 +250,8 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
             $this->local->clean();
         }
 
+        // Local cache doesn't save tags intentionally since it will cause inconsistency after flushing the cache
+        // in multinode environment
         return $this->local->save($dataToSave, $id, [], $specificLifetime);
     }
 
@@ -260,17 +262,19 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
      */
     private function checkIfLocalCacheSpaceExceeded()
     {
-        return $this->getFillingPercentage() >= ($this->_options['cleanup_percentage'] ?? 95);
+        return $this->local->getFillingPercentage() >= ($this->_options['cleanup_percentage'] ?? 95);
     }
 
     /**
      * @inheritdoc
      */
     public function remove($id)
     {
-         return $this->removeRemoteDataVersion($id) &&
-            $this->remote->remove($id) &&
-            $this->local->remove($id);
+        $result = $this->removeRemoteDataVersion($id) && $this->remote->remove($id);
+        if ($result && !$this->_options['use_stale_cache']) {
+            $result = $this->local->remove($id);
+        }
+        return $result;
     }
 
     /**
@@ -279,79 +283,79 @@ public function remove($id)
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
     {
         return $this->remote->clean($mode, $tags) &&
-            $this->local->clean($mode, $tags);
+            $this->local->clean($mode);
     }
 
     /**
      * @inheritdoc
      */
     public function getIds()
     {
-        return $this->local->getIds();
+        return $this->remote->getIds();
     }
 
     /**
      * @inheritdoc
      */
     public function getTags()
     {
-        return $this->local->getTags();
+        return $this->remote->getTags();
     }
 
     /**
      * @inheritdoc
      */
     public function getIdsMatchingTags($tags = [])
     {
-        return $this->local->getIdsMatchingTags($tags);
+        return $this->remote->getIdsMatchingTags($tags);
     }
 
     /**
      * @inheritdoc
      */
     public function getIdsNotMatchingTags($tags = [])
     {
-        return $this->local->getIdsNotMatchingTags($tags);
+        return $this->remote->getIdsNotMatchingTags($tags);
     }
 
     /**
      * @inheritdoc
      */
     public function getIdsMatchingAnyTags($tags = [])
     {
-        return $this->local->getIdsMatchingAnyTags($tags);
+        return $this->remote->getIdsMatchingAnyTags($tags);
     }
 
     /**
      * @inheritdoc
      */
     public function getFillingPercentage()
     {
-        return $this->local->getFillingPercentage();
+        return $this->remote->getFillingPercentage();
     }
 
     /**
      * @inheritdoc
      */
     public function getMetadatas($id)
     {
-        return $this->local->getMetadatas($id);
+        return $this->remote->getMetadatas($id);
     }
 
     /**
      * @inheritdoc
      */
     public function touch($id, $extraLifetime)
     {
-        return $this->local->touch($id, $extraLifetime);
+        return $this->remote->touch($id, $extraLifetime);
     }
 
     /**
      * @inheritdoc
      */
     public function getCapabilities()
     {
-        return $this->local->getCapabilities();
+        return $this->remote->getCapabilities();
     }
 
     /**

lib/internal/Magento/Framework/Cache/Test/Unit/Backend/RemoteSynchronizedCacheTest.php

@@ -337,12 +337,21 @@ public function testRemove(): void
      */
     public function testClean(): void
     {
+        $mode = 'clean_tags';
+        $tags = ['MAGE'];
         $this->remoteCacheMockExample
             ->expects($this->exactly(1))
             ->method('clean')
+            ->with($mode, $tags)
             ->willReturn(true);
 
-        $this->remoteSyncCacheInstance->clean();
+        $this->localCacheMockExample
+            ->expects($this->once())
+            ->method('clean')
+            ->with($mode, [])
+            ->willReturn(true);
+
+        $this->remoteSyncCacheInstance->clean($mode, $tags);
     }
 
     /**
@@ -353,6 +362,7 @@ public function testClean(): void
     public function testSaveWithEqualRemoteData(): void
     {
         $remoteData = 1;
+        $tags = ['MAGE'];
 
         $this->remoteCacheMockExample
             ->method('load')
@@ -361,9 +371,10 @@ public function testSaveWithEqualRemoteData(): void
         $this->localCacheMockExample
             ->expects($this->once())
             ->method('save')
+            ->with($remoteData, 1, [])
             ->willReturn(true);
 
-        $this->remoteSyncCacheInstance->save($remoteData, 1);
+        $this->remoteSyncCacheInstance->save($remoteData, 1, $tags);
     }
 
     /**