Only write session end log message if session exists (#2777)

* Only write session end log if session exists * pending changelog
livepeer · Mar 24, 2023 · db28a19 · db28a19
1 parent 8c7ec01
commit db28a19
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -17,8 +17,9 @@
 #### Transcoder
 
 ### Bug Fixes 🐞
-- \# 2759 Parse keystore address without 0x prefix, fix parse error logging
-- \# 2764 Call session end asynchronously to avoid unnecessary blocking
+- \#2759 Parse keystore address without 0x prefix, fix parse error logging
+- \#2764 Call session end asynchronously to avoid unnecessary blocking (@mjh1)
+- \#2777 Only write session end log message if session exists (@mjh1)
 
 #### CLI
 

diff --git a/core/orchestrator.go b/core/orchestrator.go
@@ -660,8 +660,13 @@ func (n *LivepeerNode) transcodeSegmentLoop(logCtx context.Context, md *SegTrans
 
 func (n *LivepeerNode) endTranscodingSession(sessionId string, logCtx context.Context) {
 	// timeout; clean up goroutine here
+	var (
+		exists  bool
+		storage *transcodeConfig
+		sess    *RemoteTranscoder
+	)
 	n.storageMutex.Lock()
-	if storage, exists := n.StorageConfigs[sessionId]; exists {
+	if storage, exists = n.StorageConfigs[sessionId]; exists {
 		storage.OS.EndSession()
 		storage.LocalOS.EndSession()
 		delete(n.StorageConfigs, sessionId)
@@ -671,7 +676,7 @@ func (n *LivepeerNode) endTranscodingSession(sessionId string, logCtx context.Co
 	if n.TranscoderManager != nil {
 		n.TranscoderManager.RTmutex.Lock()
 		// send empty segment to signal transcoder internal session teardown if session exist
-		if sess, exists := n.TranscoderManager.streamSessions[sessionId]; exists {
+		if sess, exists = n.TranscoderManager.streamSessions[sessionId]; exists {
 			segData := &net.SegData{
 				AuthToken: &net.AuthToken{SessionId: sessionId},
 			}
@@ -685,14 +690,17 @@ func (n *LivepeerNode) endTranscodingSession(sessionId string, logCtx context.Co
 	}
 	n.segmentMutex.Lock()
 	mid := ManifestID(sessionId)
-	if _, ok := n.SegmentChans[mid]; ok {
+	if _, exists = n.SegmentChans[mid]; exists {
 		close(n.SegmentChans[mid])
 		delete(n.SegmentChans, mid)
 		if lpmon.Enabled {
 			lpmon.CurrentSessions(len(n.SegmentChans))
 		}
 	}
 	n.segmentMutex.Unlock()
+	if exists {
+		clog.V(common.DEBUG).Infof(logCtx, "Transcoding session ended by the Broadcaster for sessionID=%v", sessionId)
+	}
 }
 
 func (n *LivepeerNode) serveTranscoder(stream net.Transcoder_RegisterTranscoderServer, capacity int, capabilities *net.Capabilities) {
@@ -980,9 +988,7 @@ func (rtm *RemoteTranscoderManager) selectTranscoder(sessionId string, caps *Cap
 
 // ends transcoding session and releases resources
 func (node *LivepeerNode) EndTranscodingSession(sessionId string) {
-	logCtx := context.TODO()
-	node.endTranscodingSession(sessionId, logCtx)
-	clog.V(common.DEBUG).Infof(logCtx, "Transcoding session ended by the Broadcaster for sessionID=%v", sessionId)
+	node.endTranscodingSession(sessionId, context.TODO())
 }
 
 func (node *RemoteTranscoderManager) EndTranscodingSession(sessionId string) {