MCLOUD-7845: Add MCLOUD-7205(MCP-103) to magento-cloud-patches (#64)

Author: BaDos

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-patches",
     "description": "Provides critical fixes for Magento 2 Enterprise Edition",
     "type": "magento2-component",
-    "version": "1.0.19",
+    "version": "1.0.20",
     "license": "OSL-3.0",
     "repositories": {
         "repo.magento.com": {

patches.json

@@ -255,7 +255,8 @@
       ">=2.3.3-p1 <2.3.4": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3-p1.patch",
       ">=2.3.4 <2.3.5": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.4.patch",
       ">=2.3.5 <2.3.6": "MCLOUD-6211__redis_improvement_patches__2.3.5.patch",
-      ">=2.4.0 <2.4.1": "MCLOUD-6659__fix_L2_redis_cache__2.4.0.patch"
+      ">=2.4.0 <2.4.1": "MCLOUD-6659__fix_L2_redis_cache__2.4.0.patch",
+      ">=2.4.1 <2.4.2": "MCLOUD-7845__fix_local_flushing_L2_cache__2.4.0.patch"
     },
     "Incompatible PHP Method Fix": {
       "2.3.7-p1": "AC-384__Fix_Incompatible_PHP_Method__2.3.7-p1_ce.patch",

patches/MCLOUD-6659__fix_L2_redis_cache__2.4.0.patch

@@ -1,7 +1,7 @@
 diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php b/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
 --- a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
 +++ b/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
-@@ -205,7 +205,7 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
+@@ -237,7 +237,7 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
          $dataToSave = $data;
          $remHash = $this->loadRemoteDataVersion($id);
 
@@ -10,3 +10,37 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
              $dataToSave = $this->remote->load($id);
          } else {
              $this->remote->save($data, $id, $tags, $specificLifetime);
+@@ -248,9 +248,23 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
+             $this->unlock($id);
+         }
+
++        if (!mt_rand(0, 100) && $this->checkIfLocalCacheSpaceExceeded()) {
++            $this->local->clean();
++        }
++
+         return $this->local->save($dataToSave, $id, [], $specificLifetime);
+     }
+
++    /**
++     * Check if local cache space bigger that configure amount
++     *
++     * @return bool
++     */
++    private function checkIfLocalCacheSpaceExceeded()
++    {
++        return $this->getFillingPercentage() >= 95;
++    }
++
+     /**
+      * @inheritdoc
+      */
+@@ -266,7 +280,8 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
+      */
+     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
+     {
+-        return $this->remote->clean($mode, $tags);
++        return $this->remote->clean($mode, $tags) &&
++            $this->local->clean($mode, $tags);
+     }
+
+     /**

patches/MCLOUD-7845__fix_local_flushing_L2_cache__2.4.0.patch

@@ -0,0 +1,38 @@
+diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php b/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
+index d0c05613..96f7ad84 100644
+--- a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
++++ b/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
+@@ -248,9 +248,23 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
+             $this->unlock($id);
+         }
+
++        if (!mt_rand(0, 100) && $this->checkIfLocalCacheSpaceExceeded()) {
++            $this->local->clean();
++        }
++
+         return $this->local->save($dataToSave, $id, [], $specificLifetime);
+     }
+
++    /**
++     * Check if local cache space bigger that configure amount
++     *
++     * @return bool
++     */
++    private function checkIfLocalCacheSpaceExceeded()
++    {
++        return $this->getFillingPercentage() >= 95;
++    }
++
+     /**
+      * @inheritdoc
+      */
+@@ -266,7 +280,8 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
+      */
+     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
+     {
+-        return $this->remote->clean($mode, $tags);
++        return $this->remote->clean($mode, $tags) &&
++            $this->local->clean($mode, $tags);
+     }
+
+     /**

src/Test/Functional/Acceptance/Acceptance73Cest.php

@@ -31,6 +31,7 @@ protected function patchesDataProvider(): array
             ['templateVersion' => '2.3.7', 'magentoVersion' => '2.3.7-p1'],
             ['templateVersion' => '2.3.7', 'magentoVersion' => '2.3.7-p2'],
             ['templateVersion' => '2.3.7', 'magentoVersion' => '2.3.7-p3'],
+            ['templateVersion' => '2.3.7', 'magentoVersion' => '2.3.7-p4'],
             ['templateVersion' => '2.4.0', 'magentoVersion' => '2.4.0'],
         ];
     }

src/Test/Functional/Acceptance/Acceptance74Cest.php

@@ -28,6 +28,7 @@ protected function patchesDataProvider(): array
             ['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3'],
             ['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3-p1'],
             ['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3-p2'],
+            ['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3-p3'],
         ];
     }
 }

src/Test/Functional/Acceptance/AcceptanceCest.php

@@ -49,9 +49,11 @@ public function testPatches(\CliTester $I, \Codeception\Example $data): void
     protected function patchesDataProvider(): array
     {
         return [
-            ['templateVersion' => '2.4.4'],
+            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4'],
             ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p1'],
+            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p2'],
             ['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5'],
+            ['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p1'],
         ];
     }
 }