Retry archive bucket integrity checks. (#7299)

dart-lang · Dec 12, 2023 · be5a9e3 · be5a9e3
1 parent b80dd17
commit be5a9e3
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 31 deletions.
diff --git a/app/lib/package/backend.dart b/app/lib/package/backend.dart
@@ -1552,7 +1552,7 @@ class PackageBackend {
   }
 
   /// Gets the file info of a [package] in the given [version].
-  Future<ObjectInfo?> packageTarballinfo(String package, String version) async {
+  Future<ObjectInfo?> packageTarballInfo(String package, String version) async {
     return await _publicBucket.tryInfo(tarballObjectName(package, version));
   }
 

diff --git a/app/lib/shared/integrity.dart b/app/lib/shared/integrity.dart
@@ -13,6 +13,8 @@ import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
 import 'package:pool/pool.dart';
 import 'package:pub_dev/publisher/backend.dart';
+import 'package:pub_dev/shared/env_config.dart';
+import 'package:retry/retry.dart';
 
 import '../account/agent.dart';
 import '../account/models.dart';
@@ -26,7 +28,6 @@ import '../tool/utils/http.dart';
 import 'configuration.dart';
 import 'datastore.dart';
 import 'email.dart' show looksLikeEmail;
-import 'env_config.dart';
 import 'storage.dart';
 import 'urls.dart' as urls;
 import 'utils.dart' show canonicalizeVersion, ByteArrayEqualsExt;
@@ -526,35 +527,13 @@ class IntegrityChecker {
       yield 'PackageVersion "${pv.qualifiedVersionKey}" is retracted, but `retracted` property is null.';
     }
     if (!envConfig.isRunningLocally) {
-      final info =
-          await packageBackend.packageTarballinfo(pv.package, pv.version!);
-      if (info == null) {
-        yield 'PackageVersion "${pv.qualifiedVersionKey}" has no matching archive file.';
-      }
-      final canonicalInfo = await storageService
-          .bucket(activeConfiguration.canonicalPackagesBucketName!)
-          // ignore: invalid_use_of_visible_for_testing_member
-          .tryInfo(tarballObjectName(pv.package, pv.version!));
-
-      if (canonicalInfo != null) {
-        if (!canonicalInfo.hasSameSignatureAs(info)) {
-          yield 'Canonical archive for PackageVersion "${pv.qualifiedVersionKey}" differs in old bucket.';
-        }
-
-        final publicInfo = await storageService
-            .bucket(activeConfiguration.publicPackagesBucketName!)
-            // ignore: invalid_use_of_visible_for_testing_member
-            .tryInfo(tarballObjectName(pv.package, pv.version!));
-        if (!canonicalInfo.hasSameSignatureAs(publicInfo)) {
-          yield 'Canonical archive for PackageVersion "${pv.qualifiedVersionKey}" differs in the public bucket.';
-        }
-      }
-
-      // Also issue a HTTP request.
-      final rs = await _httpClient.head(archiveDownloadUri);
-      if (rs.statusCode != 200) {
-        yield 'PackageVersion "${pv.qualifiedVersionKey}" has no matching archive file (HTTP status ${rs.statusCode}).';
-      }
+      final tarballItems = await retry(
+        () async {
+          return await _checkTarballInBuckets(pv, archiveDownloadUri).toList();
+        },
+        maxAttempts: 2,
+      );
+      yield* Stream.fromIterable(tarballItems);
     }
 
     // TODO: remove null check after the backfill should have filled the property.
@@ -595,6 +574,39 @@ class IntegrityChecker {
     }
   }
 
+  Stream<String> _checkTarballInBuckets(
+      PackageVersion pv, Uri archiveDownloadUri) async* {
+    final info =
+        await packageBackend.packageTarballInfo(pv.package, pv.version!);
+    if (info == null) {
+      yield 'PackageVersion "${pv.qualifiedVersionKey}" has no matching archive file.';
+    }
+    final canonicalInfo = await storageService
+        .bucket(activeConfiguration.canonicalPackagesBucketName!)
+        // ignore: invalid_use_of_visible_for_testing_member
+        .tryInfo(tarballObjectName(pv.package, pv.version!));
+
+    if (canonicalInfo != null) {
+      if (!canonicalInfo.hasSameSignatureAs(info)) {
+        yield 'Canonical archive for PackageVersion "${pv.qualifiedVersionKey}" differs in old bucket.';
+      }
+
+      final publicInfo = await storageService
+          .bucket(activeConfiguration.publicPackagesBucketName!)
+          // ignore: invalid_use_of_visible_for_testing_member
+          .tryInfo(tarballObjectName(pv.package, pv.version!));
+      if (!canonicalInfo.hasSameSignatureAs(publicInfo)) {
+        yield 'Canonical archive for PackageVersion "${pv.qualifiedVersionKey}" differs in the public bucket.';
+      }
+    }
+
+    // Also issue a HTTP request.
+    final rs = await _httpClient.head(archiveDownloadUri);
+    if (rs.statusCode != 200) {
+      yield 'PackageVersion "${pv.qualifiedVersionKey}" has no matching archive file (HTTP status ${rs.statusCode}).';
+    }
+  }
+
   Stream<String> _checkLikes() async* {
     _logger.info('Scanning Likes...');