B2B- 1789: The first Request For Storefront Image After Deleting Local File System Cached Images Results In Magento Placeholder Image When Using S3

Author: joanhe

app/code/Magento/Backend/Test/Mftf/Helper/CurlHelpers.php

@@ -57,8 +57,6 @@ public function assertImageContentIsEqual(
     ): void {
         $cookie = $this->getCookie($cookieName);
         $imageContent = $this->getCurlResponse($url, $cookie, $postBody);
-        // Must make request twice until bug is resolved: B2B-1789
-        $imageContent = $this->getCurlResponse($url, $cookie, $postBody);
         // md5() here is not for cryptographic use.
         // phpcs:ignore Magento2.Security.InsecureFunction
         $imageContentMD5 = md5($imageContent);

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

@@ -216,15 +216,18 @@ public function launch(): ResponseInterface
      */
     private function createLocalCopy(): void
     {
-        $this->syncFactory->create(['directory' => $this->directoryPub])
-            ->synchronize($this->relativeFileName);
+        $synchronizer = $this->syncFactory->create(['directory' => $this->directoryPub]);
+        $synchronizer->synchronize($this->relativeFileName);
 
         if ($this->directoryPub->isReadable($this->relativeFileName)) {
             return;
         }
 
         if ($this->mediaUrlFormat === CatalogMediaConfig::HASH) {
             $this->imageResize->resizeFromImageName($this->getOriginalImage($this->relativeFileName));
+            if (!$this->directoryPub->isReadable($this->relativeFileName)) {
+                $synchronizer->synchronize($this->relativeFileName);
+            }
         }
     }