ACP2E-2631: Hidden directories in pub/media/catalog/product cause disk space issues

Author: thiaramus

app/code/Magento/Catalog/Model/Product/Image.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Image as MagentoImage;
 use Magento\Framework\Serialize\SerializerInterface;
 
@@ -836,37 +837,12 @@ public function getWatermarkHeight()
     public function clearCache()
     {
         $directory = $this->_catalogProductMediaConfig->getBaseMediaPath() . '/cache';
-        $directoryToDelete = $directory;
-        // Fixes issue when deleting cache directory at the same time that images are being
-        // lazy-loaded on storefront leading to new directories and files generation in the cache directory
-        // that would prevent deletion of the cache directory.
-        // RCA: the method delete() recursively enumerates and delete all subdirectories and files before deleting
-        // the target directory, which gives other processes time to create directories and files in the same directory.
-        // Solution: Rename the directory to simulate deletion and delete the destination directory afterward
-
         try {
-            //generate name in format: \.[0-9A-ZA-z-_]{3} (e.g .QX3)
-            $tmpDirBasename = strrev(strtr(base64_encode(random_bytes(2)), '+/=', '-_.'));
-            $tmpDirectory = $this->_catalogProductMediaConfig->getBaseMediaPath() . '/' . $tmpDirBasename;
-            //delete temporary directory if exists
-            if ($this->_mediaDirectory->isDirectory($tmpDirectory)) {
-                $this->_mediaDirectory->delete($tmpDirectory);
-            }
-            //rename the directory to simulate deletion and delete the destination directory
-            if ($this->_mediaDirectory->isDirectory($directory) &&
-                true === $this->_mediaDirectory->getDriver()->rename(
-                    $this->_mediaDirectory->getAbsolutePath($directory),
-                    $this->_mediaDirectory->getAbsolutePath($tmpDirectory)
-                )
-            ) {
-                $directoryToDelete = $tmpDirectory;
-            }
-        } catch (\Throwable $exception) {
-            //ignore exceptions thrown during renaming
-            $directoryToDelete = $directory;
+            $this->_mediaDirectory->delete($directory);
+        }
+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+        catch (FileSystemException $e) {
         }
-
-        $this->_mediaDirectory->delete($directoryToDelete);
 
         $this->_coreFileStorageDatabase->deleteFolder($this->_mediaDirectory->getAbsolutePath($directory));
         $this->clearImageInfoFromCache();