fix: for pod that's been GC'ed we need to get the log from the artifa…

…ct (#9540)
argoproj · Sep 8, 2022 · 9d66b69 · 9d66b69
1 parent 34a4e48
commit 9d66b69
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/ui/src/app/shared/services/workflows-service.ts b/ui/src/app/shared/services/workflows-service.ts
@@ -206,8 +206,16 @@ export class WorkflowsService {
         if (archived) {
             return getLogsFromArtifact();
         }
+
         // return archived log if main container is finished and has artifact
-        return this.getContainerLogsFromCluster(workflow, podName, container, grep).pipe(catchError(getLogsFromArtifact));
+        return from(this.isWorkflowNodePendingOrRunning(workflow, nodeId)).pipe(
+            switchMap(isPendingOrRunning => {
+                if (!isPendingOrRunning && this.hasArtifactLogs(workflow, nodeId, container) && container === 'main') {
+                    return getLogsFromArtifact();
+                }
+                return this.getContainerLogsFromCluster(workflow, podName, container, grep).pipe(catchError(getLogsFromArtifact));
+            })
+        );
     }
 
     public getArtifactLogsPath(workflow: Workflow, nodeId: string, container: string, archived: boolean) {