Do not retry or panic on upload exceptions when the version is no longer scheduled for analysis.

Author: isoos

app/lib/task/backend.dart

@@ -686,13 +686,14 @@ class TaskBackend {
       final key = PackageState.createKey(_db, runtimeVersion, package);
       final state = await tx.lookupOrNull<PackageState>(key);
       if (state == null || state.versions![version] == null) {
-        throw NotFoundException.resource('$package/$version');
+        throw NotAcceptableException(
+            '$package/$version is no longer selected for analysis.');
       }
       final versionState = state.versions![version]!;
 
       // Check the secret token
       if (!versionState.isAuthorized(_extractBearerToken(request))) {
-        throw AuthenticationException.authenticationRequired();
+        throw NotAcceptableException('Secret token is no longer accepted.');
       }
       assert(versionState.scheduled != initialTimestamp);
       assert(versionState.instance != null);

pkg/pub_worker/lib/src/analyze.dart

@@ -92,12 +92,12 @@ Future<void> analyze(Payload payload) async {
                 'analyze.',
           );
         }
+      } on ResultNotAcceptedUploadException catch (e, st) {
+        _log.warning(
+            'failed to upload ${payload.package} / ${p.version}', e, st);
       } catch (e, st) {
         _log.shout(
-          'failed to process ${payload.package} / ${p.version}',
-          e,
-          st,
-        );
+            'failed to process ${payload.package} / ${p.version}', e, st);
       }
     }
   } finally {

pkg/pub_worker/lib/src/upload.dart

@@ -40,6 +40,13 @@ Future<void> upload(
         ));
       final res = await Response.fromStream(await client.send(req));
 
+      // Special case `NotAcceptable` response code, it means that the analysis
+      // is no longer selected or the secret token timed out / was replaced
+      // (it may need a different analysis round).
+      if (res.statusCode == 406) {
+        _log.warning('Failed to upload: $filename, status = ${res.statusCode}');
+        throw ResultNotAcceptedUploadException(res.body);
+      }
       if (400 <= res.statusCode && res.statusCode < 500) {
         _log.shout('Failed to upload: $filename, status = ${res.statusCode}');
         throw UploadException(
@@ -80,3 +87,7 @@ final class UploadException implements Exception {
 final class IntermittentUploadException extends UploadException {
   IntermittentUploadException(String message) : super(message);
 }
+
+final class ResultNotAcceptedUploadException extends UploadException {
+  ResultNotAcceptedUploadException(String message) : super(message);
+}