Merge pull request #28426 from deads2k/fix-stream-race

eliminate the closed channel race in pod_log_streamer

Author: openshift-merge-bot[bot]

pkg/monitortestlibrary/podaccess/pod_log_streamer.go

@@ -95,23 +95,13 @@ func (s *PodStreamer) streamLogs(ctx context.Context) (bool, error) {
 		return false, nil
 	}
 
-	exit := make(chan struct{})
-	go func(ctx context.Context, currPod *corev1.Pod) {
-		defer utilruntime.HandleCrash()
-		defer close(exit)
-		s.streamLogsReader(ctx, currPod)
-	}(ctx, currPod)
-
-	select {
-	case <-exit:
-		return false, nil
-	case <-ctx.Done():
-		// wait just a moment so that the streamLogsReader doesn't write to a closed channel
-		time.Sleep(100 * time.Millisecond)
-		return false, nil
-	}
+	s.streamLogsReader(ctx, currPod)
+	return false, nil
 }
 
+// streamLogsReader will run and block until
+// 1. server closes the http connection
+// 2. context is closed.
 func (s *PodStreamer) streamLogsReader(ctx context.Context, currPod *corev1.Pod) {
 	caughtUpToLastLine := false
 	if currPod.UID != s.lastUID {
@@ -131,7 +121,7 @@ func (s *PodStreamer) streamLogsReader(ctx context.Context, currPod *corev1.Pod)
 		Container:  s.containerName,
 		Follow:     true,
 		Timestamps: true,
-	}).Stream(context.Background())
+	}).Stream(ctx)
 	if err != nil {
 		s.errs <- LogError{
 			Pod:     currPod,
@@ -140,6 +130,7 @@ func (s *PodStreamer) streamLogsReader(ctx context.Context, currPod *corev1.Pod)
 		}
 		return
 	}
+
 	scan := bufio.NewScanner(reader)
 	for scan.Scan() {
 		// exit if we have been stopped.