Ensure we correctly purge from the CDN and fail to publish the update if that fails

Author: Seldaek

src/Package/V2Dumper.php

@@ -421,7 +421,16 @@ private function writeV2File(Package $package, string $name, string $path, strin
             }
         } while ($retries-- > 0);
 
-        $this->cdnClient->purgeMetadataCache($relativePath);
+        $retries = 3;
+        do {
+            if ($this->cdnClient->purgeMetadataCache($relativePath)) {
+                break;
+            }
+            if ($retries === 0) {
+                throw new \RuntimeException('Failed to purge cache for '.$relativePath);
+            }
+            sleep(1);
+        } while ($retries-- > 0);
 
         $this->redis->zadd('metadata-dumps', [$pkgWithDevFlag => $filemtime]);
         $this->statsd->increment('packagist.metadata_dump_v2');

src/Service/CdnClient.php

@@ -45,7 +45,7 @@ public function uploadMetadata(string $path, string $contents): int
         return $time;
     }
 
-    public function purgeMetadataCache(string $path): void
+    public function purgeMetadataCache(string $path): bool
     {
         $resp = $this->httpClient->request('POST', 'https://api.bunny.net/purge?'.http_build_query(['url' => $this->metadataPublicEndpoint.$path, 'async' => 'true']), [
             'headers' => [
@@ -54,8 +54,12 @@ public function purgeMetadataCache(string $path): void
         ]);
         // wait for status code at least
         if ($resp->getStatusCode() !== 200) {
-            $this->logger->error('Failed purging '.$path.' from CDN');
+            $this->logger->error('Failed purging '.$path.' from CDN', ['response' => $resp->getContent(false), 'status' => $resp->getStatusCode()]);
+
+            return false;
         }
+
+        return true;
     }
 
     public function sendUploadMetadataRequest(string $path, string $contents): ResponseInterface