Fix race condition with stream existence check (#3309)

* Fix race condition with stream existence check * Simplify, just call startControlPublish first
livepeer · Dec 12, 2024 · 77711d4 · 77711d4
1 parent a367c90
commit 77711d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/server/ai_live_video.go b/server/ai_live_video.go
@@ -132,8 +132,8 @@ func copySegment(segment *http.Response, w io.Writer) error {
 }
 
 func startControlPublish(control *url.URL, params aiRequestParams) {
-	controlPub, err := trickle.NewTricklePublisher(control.String())
 	stream := params.liveParams.stream
+	controlPub, err := trickle.NewTricklePublisher(control.String())
 	if err != nil {
 		slog.Info("error starting control publisher", "stream", stream, "err", err)
 		return

diff --git a/server/ai_process.go b/server/ai_process.go
@@ -1048,16 +1048,15 @@ func submitLiveVideoToVideo(ctx context.Context, params aiRequestParams, sess *A
 		if err != nil {
 			return nil, fmt.Errorf("invalid control URL: %w", err)
 		}
-		// TODO any errors from these funcs should we kill the input stream?
-
 		events, err := common.AppendHostname(*resp.JSON200.EventsUrl, host)
 		if err != nil {
 			return nil, fmt.Errorf("invalid events URL: %w", err)
 		}
 		clog.V(common.VERBOSE).Infof(ctx, "pub %s sub %s control %s events %s", pub, sub, control, events)
+
+		startControlPublish(control, params)
 		startTricklePublish(ctx, pub, params, sess)
 		startTrickleSubscribe(ctx, sub, params)
-		startControlPublish(control, params)
 		startEventsSubscribe(ctx, events, params)
 	}
 	return resp, nil