ACP2E-1321: L2 cache save not working

Author: dhorytskyi

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

@@ -195,14 +195,14 @@ public function load($id, $doNotTestCacheValidity = false)
     {
         $localData = $this->local->load($id);
 
-        if ($localData) {
+        if ($localData !== false) {
             if ($this->getDataVersion($localData) === $this->loadRemoteDataVersion($id)) {
                 return $localData;
             }
         }
 
         $remoteData = $this->remote->load($id);
-        if ($remoteData) {
+        if ($remoteData !== false) {
             $this->local->save($remoteData, $id);
 
             return $remoteData;
@@ -233,10 +233,15 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
     {
         $dataToSave = $data;
         $remHash = $this->loadRemoteDataVersion($id);
-
+        $isRemoteUpToDate = false;
         if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
-            $dataToSave = $this->remote->load($id);
-        } else {
+            $remoteData = $this->remote->load($id);
+            if ($remoteData !== false && $this->getDataVersion($data) === $this->getDataVersion($remoteData)) {
+                $isRemoteUpToDate = true;
+                $dataToSave = $remoteData;
+            }
+        }
+        if (!$isRemoteUpToDate) {
             $this->remote->save($data, $id, $tags, $specificLifetime);
             $this->saveRemoteDataVersion($data, $id, $tags, $specificLifetime);
         }

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

@@ -10,17 +10,11 @@
 use Magento\Framework\Cache\Backend\Database;
 use Magento\Framework\Cache\Backend\RemoteSynchronizedCache;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class RemoteSynchronizedCacheTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
-    protected $objectManager;
-
     /**
      * @var \Cm_Cache_Backend_File|MockObject
      */
@@ -41,24 +35,12 @@ class RemoteSynchronizedCacheTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->objectManager = new ObjectManager($this);
-
-        $this->localCacheMockExample = $this->getMockBuilder(\Cm_Cache_Backend_File::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->remoteCacheMockExample = $this->getMockBuilder(Database::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        /** @var \Magento\Framework\Cache\Backend\Database $databaseCacheInstance */
-
-        $this->remoteSyncCacheInstance = $this->objectManager->getObject(
-            RemoteSynchronizedCache::class,
+        $this->localCacheMockExample = $this->createMock(\Cm_Cache_Backend_File::class);
+        $this->remoteCacheMockExample = $this->createMock(Database::class);
+        $this->remoteSyncCacheInstance = new RemoteSynchronizedCache(
             [
-                'options' => [
-                    'remote_backend' => $this->remoteCacheMockExample,
-                    'local_backend' => $this->localCacheMockExample
-                ]
+                'remote_backend' => $this->remoteCacheMockExample,
+                'local_backend' => $this->localCacheMockExample
             ]
         );
     }
@@ -67,19 +49,13 @@ protected function setUp(): void
      * Test that exception is thrown if cache is not configured.
      *
      * @param array $options
-     *
      * @return void
      * @dataProvider initializeWithExceptionDataProvider
      */
     public function testInitializeWithException($options): void
     {
         $this->expectException('Zend_Cache_Exception');
-        $this->objectManager->getObject(
-            RemoteSynchronizedCache::class,
-            [
-                'options' => $options
-            ]
-        );
+        new RemoteSynchronizedCache($options);
     }
 
     /**
@@ -119,12 +95,7 @@ public function initializeWithExceptionDataProvider(): array
      */
     public function testInitializeWithOutException($options): void
     {
-        $result = $this->objectManager->getObject(
-            RemoteSynchronizedCache::class,
-            [
-                'options' => $options
-            ]
-        );
+        $result = new RemoteSynchronizedCache($options);
         $this->assertInstanceOf(RemoteSynchronizedCache::class, $result);
     }
 
@@ -377,6 +348,38 @@ public function testSaveWithEqualRemoteData(): void
         $this->remoteSyncCacheInstance->save($remoteData, 1, $tags);
     }
 
+    /**
+     * Test data save when remote data are missed but hash exists.
+     *
+     * @return void
+     */
+    public function testSaveWithEqualHashesAndMissedRemoteData(): void
+    {
+        $cacheKey = 'key';
+        $dataToSave = '2';
+        $remoteData = '1';
+        $tags = ['MAGE'];
+
+        $this->remoteCacheMockExample
+            ->method('load')
+            ->willReturnOnConsecutiveCalls(\hash('sha256', $dataToSave), $remoteData);
+
+        $this->remoteCacheMockExample
+            ->expects($this->exactly(2))
+            ->method('save')
+            ->withConsecutive(
+                [$dataToSave, $cacheKey, $tags],
+                [\hash('sha256', $dataToSave), $cacheKey . ':hash', $tags]
+            )->willReturn(true);
+        $this->localCacheMockExample
+            ->expects($this->once())
+            ->method('save')
+            ->with($dataToSave, $cacheKey, [])
+            ->willReturn(true);
+
+        $this->remoteSyncCacheInstance->save($dataToSave, $cacheKey, $tags);
+    }
+
     /**
      * @return void
      */