MCP-103: L2 cache local flushing issues

Author: vzabaznov

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

@@ -238,10 +238,6 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
         $dataToSave = $data;
         $remHash = $this->loadRemoteDataVersion($id);
 
-        if ($this->checkLocalCacheSpace()) {
-            $this->local->clean();
-        }
-
         if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
             $dataToSave = $this->remote->load($id);
         } else {
@@ -253,6 +249,10 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
             $this->unlock($id);
         }
 
+        if (!mt_rand(0, 100) && $this->checkIfLocalCacheSpaceExceeded()) {
+            $this->local->clean();
+        }
+
         return $this->local->save($dataToSave, $id, [], $specificLifetime);
     }
 
@@ -261,34 +261,9 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
      *
      * @return bool
      */
-    private function checkLocalCacheSpace()
-    {
-        return
-            (
-                $this->getDirectorySize($this->_options['local_backend_options']['cache_dir'])
-            ) / 1024 / 1024 >=
-            $this->_options['local_backend_max_size'];
-    }
-
-    /**
-     * Get directory size
-     *
-     * @param $directory
-     * @return int
-     */
-    private function getDirectorySize($directory)
+    private function checkIfLocalCacheSpaceExceeded()
     {
-        $it = new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS);
-        $ri = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
-
-        $size = 0;
-        foreach ($ri as $file) {
-            if ($file->isFile()) {
-                $size += $file->getSize();
-            }
-        }
-
-        return $size;
+        return $this->getFillingPercentage() >= $this->_options['local_backend_max_size'];
     }
 
     /**