Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Retry archive bucket integrity checks. #7299

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Retry archive bucket integrity checks. #7299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c755847
Retry archive bucket integrity checks.
isoos Dec 12, 2023
70c3d25
Fix spelling
isoos Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/lib/package/backend.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
72 changes: 42 additions & 30 deletions app/lib/shared/integrity.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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;
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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...');

Expand Down