Report infra_error for action download failures. (#4294)

src/Runner.Worker/ActionManager.cs

@@ -115,6 +115,14 @@ namespace GitHub.Runner.Worker
                 executionContext.Result = TaskResult.Failed;
                 throw;
             }
+            catch (FailedToDownloadActionException ex)
+            {
+                // Log the error and fail the PrepareActionsAsync Initialization.
+                Trace.Error($"Caught exception from PrepareActionsAsync Initialization: {ex}");
+                executionContext.InfrastructureError(ex.InnerException?.Message ?? ex.Message, category: "error_download_action");
+                executionContext.Result = TaskResult.Failed;
+                throw;
+            }
             catch (InvalidActionArchiveException ex)
             {
                 // Log the error and fail the PrepareActionsAsync Initialization.
@@ -1157,6 +1165,8 @@ namespace GitHub.Runner.Worker
 
             // Allow up to 20 * 60s for any action to be downloaded from github graph.
             int timeoutSeconds = 20 * 60;
+            try
+            {
                 while (retryCount < 3)
                 {
                     string requestId = string.Empty;
@@ -1244,6 +1254,13 @@ namespace GitHub.Runner.Worker
                         await Task.Delay(backOff);
                     }
                 }
+            }
+            catch (Exception ex) when (!(ex is OperationCanceledException) && !executionContext.CancellationToken.IsCancellationRequested)
+            {
+                Trace.Error($"Failed to download archive '{downloadUrl}' after {retryCount + 1} attempts.");
+                Trace.Error(ex);
+                throw new FailedToDownloadActionException($"Failed to download archive '{downloadUrl}' after {retryCount + 1} attempts.", ex);
+            }
 
             ArgUtil.NotNullOrEmpty(archiveFile, nameof(archiveFile));
             executionContext.Debug($"Download '{downloadUrl}' to '{archiveFile}'");

src/Sdk/DTWebApi/WebApi/Exceptions.cs

@@ -2556,6 +2556,25 @@ namespace GitHub.DistributedTask.WebApi
         }
     }
 
+    [Serializable]
+    public sealed class FailedToDownloadActionException : DistributedTaskException
+    {
+        public FailedToDownloadActionException(String message)
+            : base(message)
+        {
+        }
+
+        public FailedToDownloadActionException(String message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        private FailedToDownloadActionException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+
     [Serializable]
     public sealed class InvalidActionArchiveException : DistributedTaskException
     {

src/Test/L0/Worker/ActionManagerL0.cs

@@ -198,7 +198,8 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Func<Task> action = async () => await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 //Assert
-                await Assert.ThrowsAsync<ActionNotFoundException>(action);
+                var ex = await Assert.ThrowsAsync<FailedToDownloadActionException>(action);
+                Assert.IsType<ActionNotFoundException>(ex.InnerException);
 
                 var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "main.completed");
                 Assert.False(File.Exists(watermarkFile));