ACP2E-3100: Image File does not exist in New Relic Error Log

app/code/Magento/Catalog/Model/View/Asset/Placeholder.php

@@ -7,10 +7,15 @@
 namespace Magento\Catalog\Model\View\Asset;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\DriverPool;
 use Magento\Framework\View\Asset\ContextInterface;
 use Magento\Framework\View\Asset\File\NotFoundException;
 use Magento\Framework\View\Asset\LocalInterface;
 use Magento\Framework\View\Asset\Repository;
+use Magento\Catalog\Model\Product\Media\ConfigInterface;
 
 /**
  * A locally available image placeholder file asset that can be referred with a file type
@@ -53,28 +58,49 @@ class Placeholder implements LocalInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $directoryMedia;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $mediaConfig;
+
     /**
      * Placeholder constructor.
      *
      * @param ContextInterface $context
      * @param ScopeConfigInterface $scopeConfig
      * @param Repository $assetRepo
      * @param string $type
+     * @param Filesystem|null $filesystem
+     * @param ConfigInterface|null $mediaConfig
+     *
      */
     public function __construct(
         ContextInterface $context,
         ScopeConfigInterface $scopeConfig,
         Repository $assetRepo,
-        $type
+        $type,
+        ?Filesystem $filesystem = null,
+        ?ConfigInterface $mediaConfig = null
     ) {
         $this->context = $context;
         $this->scopeConfig = $scopeConfig;
         $this->assetRepo = $assetRepo;
         $this->type = $type;
+        $filesystem = $filesystem ?? ObjectManager::getInstance()->get(Filesystem::class);
+        $this->mediaConfig = $mediaConfig ?? ObjectManager::getInstance()->get(ConfigInterface::class);
+        $this->directoryMedia = $filesystem->getDirectoryWrite(
+            DirectoryList::MEDIA,
+            DriverPool::FILE
+        );
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getUrl()
     {
@@ -101,7 +127,7 @@ public function getContentType()
     public function getPath()
     {
         if ($this->getFilePath() !== null) {
-            $result = $this->getContext()->getPath()
+            $result = $this->getLocalMediaPath()
                 . DIRECTORY_SEPARATOR . $this->getModule()
                 . DIRECTORY_SEPARATOR . $this->getFilePath();
         } else {
@@ -119,7 +145,35 @@ public function getPath()
     }
 
     /**
-     * {@inheritdoc}
+     * Get path for local media
+     *
+     * @return string
+     */
+    private function getLocalMediaPath()
+    {
+        return $this->directoryMedia->getAbsolutePath($this->mediaConfig->getBaseMediaPath());
+    }
+
+    /**
+     * Get relative placeholder path
+     *
+     * @return string|null
+     */
+    public function getRelativePath()
+    {
+        $result = null;
+        //will use system placeholder unless another specified in the config
+        if ($this->getFilePath() !== null) {
+            $result = DIRECTORY_SEPARATOR . DirectoryList::MEDIA
+                . DIRECTORY_SEPARATOR . $this->directoryMedia->getRelativePath($this->mediaConfig->getBaseMediaPath())
+                . DIRECTORY_SEPARATOR . $this->getModule()
+                . DIRECTORY_SEPARATOR . $this->getFilePath();
+        }
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
      */
     public function getSourceFile()
     {
@@ -137,15 +191,15 @@ public function getSourceContentType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getContent()
     {
         return null;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFilePath()
     {
@@ -163,7 +217,8 @@ public function getFilePath()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @return ContextInterface
      */
     public function getContext()
@@ -172,7 +227,7 @@ public function getContext()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getModule()
     {

app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php

@@ -15,28 +15,40 @@
 use Magento\Store\Model\ScopeInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Filesystem;
+use Magento\Catalog\Model\Product\Media\ConfigInterface;
 
 class PlaceholderTest extends TestCase
 {
     /**
      * @var Placeholder
      */
-    protected $model;
+    private $model;
 
     /**
      * @var ScopeConfigInterface|MockObject
      */
-    protected $scopeConfig;
+    private $scopeConfig;
 
     /**
      * @var Repository|MockObject
      */
-    protected $repository;
+    private $repository;
 
     /**
      * @var ContextInterface|MockObject
      */
-    protected $imageContext;
+    private $imageContext;
+
+    /**
+     * @var Filesystem|MockObject
+     */
+    private $filesystem;
+
+    /**
+     * @var ConfigInterface|MockObject
+     */
+    private $mediaConfig;
 
     protected function setUp(): void
     {
@@ -47,11 +59,18 @@ protected function setUp(): void
         $this->repository = $this->getMockBuilder(Repository::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->filesystem = $this->createMock(Filesystem::class);
+        $this->filesystem->expects($this->any())
+            ->method('getDirectoryWrite')
+            ->willReturn($this->createMock(\Magento\Framework\Filesystem\Directory\WriteInterface::class));
+        $this->mediaConfig = $this->createMock(ConfigInterface::class);
         $this->model = new Placeholder(
             $this->imageContext,
             $this->scopeConfig,
             $this->repository,
-            'thumbnail'
+            'thumbnail',
+            $this->filesystem,
+            $this->mediaConfig
         );
     }
 
@@ -87,7 +106,9 @@ public function testGetPathAndGetSourceFile($imageType, $placeholderPath)
             $this->imageContext,
             $this->scopeConfig,
             $this->repository,
-            $imageType
+            $imageType,
+            $this->filesystem,
+            $this->mediaConfig
         );
         $absolutePath = '/var/www/html/magento2ce/pub/media/catalog/product';
 
@@ -108,8 +129,7 @@ public function testGetPathAndGetSourceFile($imageType, $placeholderPath)
             $this->repository->expects($this->any())->method('createAsset')->willReturn($assetMock);
         } else {
             $this->imageContext->expects($this->any())->method('getPath')->willReturn($absolutePath);
-            $expectedResult = $absolutePath
-                . DIRECTORY_SEPARATOR . $imageModel->getModule()
+            $expectedResult = DIRECTORY_SEPARATOR . $imageModel->getModule()
                 . DIRECTORY_SEPARATOR . $placeholderPath;
         }
 
@@ -128,7 +148,9 @@ public function testGetUrl($imageType, $placeholderPath)
             $this->imageContext,
             $this->scopeConfig,
             $this->repository,
-            $imageType
+            $imageType,
+            $this->filesystem,
+            $this->mediaConfig
         );
 
         $this->scopeConfig->expects($this->any())

app/code/Magento/MediaStorage/App/Media.php

@@ -227,6 +227,18 @@ private function createLocalCopy(): void
         }
     }
 
+    /**
+     * Create local vopy for the placeholder
+     *
+     * @param string $relativeFileName
+     * @return void
+     */
+    private function createPlaceholderLocalCopy(string $relativeFileName): void
+    {
+        $synchronizer = $this->syncFactory->create(['directory' => $this->directoryMedia]);
+        $synchronizer->synchronize($relativeFileName);
+    }
+
     /**
      * Check if media directory changed
      *
@@ -248,6 +260,7 @@ private function checkMediaDirectoryChanged(): bool
     private function setPlaceholderImage(): void
     {
         $placeholder = $this->placeholderFactory->create(['type' => 'image']);
+        $this->createPlaceholderLocalCopy($placeholder->getRelativePath());
         $this->response->setFilePath($placeholder->getPath());
     }
 

app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php

@@ -175,8 +175,7 @@ public function testProcessRequestReturnsNotFoundIfFileIsNotSynchronized(): void
     {
         $this->mediaModel = $this->createMediaModel();
 
-        $this->sync->expects(self::once())
-            ->method('synchronize')
+        $this->sync->method('synchronize')
             ->with(self::RELATIVE_FILE_PATH);
         $this->directoryMediaMock->expects(self::once())
             ->method('getAbsolutePath')
@@ -270,9 +269,11 @@ protected function createMediaModel(bool $isAllowed = true): Media
 
         $driverFile =  $this->createMock(Filesystem\Driver\File::class);
         $driverFile->method('getRealPath')->willReturn('');
+        $placeholder = $this->createMock(Placeholder::class);
+        $placeholder->method('getRelativePath')->willReturn(self::RELATIVE_FILE_PATH);
         $placeholderFactory = $this->createMock(PlaceholderFactory::class);
         $placeholderFactory->method('create')
-            ->willReturn($this->createMock(Placeholder::class));
+            ->willReturn($placeholder);
 
         return new Media(
             $this->configFactoryMock,