Merge branch 'MCP-103' into mcp-123

Author: vzabaznov

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

@@ -248,9 +248,23 @@ 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);
     }
 
+    /**
+     * Check if local cache space bigger that configure amount
+     *
+     * @return bool
+     */
+    private function checkIfLocalCacheSpaceExceeded()
+    {
+        return $this->getFillingPercentage() >= 95;
+    }
+
     /**
      * @inheritdoc
      */
@@ -266,7 +280,8 @@ public function remove($id)
      */
     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);
     }
 
     /**