From eed8e8500825097c16ff68762154e1f5625aca80 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Sun, 27 Aug 2023 19:17:38 -0700 Subject: [PATCH 1/3] Demote more logs to debug (#1998) --- pkg/rtc/participant.go | 4 ++-- pkg/rtc/room.go | 3 ++- pkg/service/rtcservice.go | 2 +- pkg/sfu/buffer/rtpstats.go | 2 +- pkg/sfu/streamallocator/probe_controller.go | 2 +- pkg/sfu/streamallocator/streamallocator.go | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index 51aabb7c8..ed4cef8f9 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -836,7 +836,7 @@ func (p *ParticipantImpl) SetMigrateState(s types.MigrateState) { return } - p.params.Logger.Infow("SetMigrateState", "state", s) + p.params.Logger.Debugw("SetMigrateState", "state", s) p.migrateState.Store(s) p.dirty.Store(true) @@ -1536,7 +1536,7 @@ func (p *ParticipantImpl) onSubscribedMaxQualityChange(trackID livekit.TrackID, ) } - p.pubLogger.Infow( + p.pubLogger.Debugw( "sending max subscribed quality", "trackID", trackID, "qualities", subscribedQualities, diff --git a/pkg/rtc/room.go b/pkg/rtc/room.go index e9e662d59..7ee47bc22 100644 --- a/pkg/rtc/room.go +++ b/pkg/rtc/room.go @@ -1330,7 +1330,8 @@ func BroadcastDataPacketForRoom(r types.Room, source types.LocalParticipant, dp utils.ParallelExec(destParticipants, dataForwardLoadBalanceThreshold, 1, func(op types.LocalParticipant) { err := op.SendDataPacket(dp, dpData) - if err != nil && !errors.Is(err, io.ErrClosedPipe) && !errors.Is(err, psrpc.Canceled) { + if err != nil && !errors.Is(err, io.ErrClosedPipe) && !errors.Is(err, psrpc.Canceled) && + errors.Is(err, psrpc.ErrStreamClosed) { op.GetLogger().Infow("send data packet error", "error", err) } }) diff --git a/pkg/service/rtcservice.go b/pkg/service/rtcservice.go index f19c70fce..f469cda2d 100644 --- a/pkg/service/rtcservice.go +++ b/pkg/service/rtcservice.go @@ -371,7 +371,7 @@ func (s *RTCService) ServeHTTP(w http.ResponseWriter, r *http.Request) { websocket.CloseNormalClosure, websocket.CloseNoStatusReceived, ) { - pLogger.Infow("exit ws read loop for closed connection", "connID", cr.ConnectionID, "wsError", err) + pLogger.Debugw("exit ws read loop for closed connection", "connID", cr.ConnectionID, "wsError", err) } else { pLogger.Errorw("error reading from websocket", err, "connID", cr.ConnectionID) } diff --git a/pkg/sfu/buffer/rtpstats.go b/pkg/sfu/buffer/rtpstats.go index bcdbbf858..e0117ebe8 100644 --- a/pkg/sfu/buffer/rtpstats.go +++ b/pkg/sfu/buffer/rtpstats.go @@ -838,7 +838,7 @@ func (r *RTPStats) maybeAdjustFirstPacketTime(ets uint64) { "extStartTS", r.timestamp.GetExtendedStart(), ) if r.firstTime.Sub(firstTime) > firstPacketTimeAdjustThreshold { - r.logger.Infow("first packet time adjustment too big, ignoring", + r.logger.Debugw("first packet time adjustment too big, ignoring", "startTime", r.startTime.String(), "nowTime", now.String(), "before", r.firstTime.String(), diff --git a/pkg/sfu/streamallocator/probe_controller.go b/pkg/sfu/streamallocator/probe_controller.go index 0d7bb52b7..3796e3bfa 100644 --- a/pkg/sfu/streamallocator/probe_controller.go +++ b/pkg/sfu/streamallocator/probe_controller.go @@ -154,7 +154,7 @@ func (p *ProbeController) MaybeFinalizeProbe( queueWait = p.params.Config.SettleWaitMax } p.probeEndTime = p.lastProbeStartTime.Add(queueWait + p.doneProbeClusterInfo.Duration) - p.params.Logger.Infow( + p.params.Logger.Debugw( "setting probe end time", "probeClusterId", p.probeClusterId, "expectedDuration", expectedDuration, diff --git a/pkg/sfu/streamallocator/streamallocator.go b/pkg/sfu/streamallocator/streamallocator.go index 6441714b2..6751f29cb 100644 --- a/pkg/sfu/streamallocator/streamallocator.go +++ b/pkg/sfu/streamallocator/streamallocator.go @@ -991,7 +991,7 @@ func (s *StreamAllocator) onProbeDone(isNotFailing bool, isGoalReached bool) { // channelObserverString := s.channelObserver.ToString() s.channelObserver = s.newChannelObserverNonProbe() - s.params.Logger.Infow( + s.params.Logger.Debugw( "probe done", "isNotFailing", isNotFailing, "isGoalReached", isGoalReached, From 35f5629910531e4d546ca9b153453a29fb23e88f Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Mon, 28 Aug 2023 08:24:18 +0530 Subject: [PATCH 2/3] fix typo (#2005) --- pkg/sfu/buffer/rtpstats.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/sfu/buffer/rtpstats.go b/pkg/sfu/buffer/rtpstats.go index e0117ebe8..9468e1b04 100644 --- a/pkg/sfu/buffer/rtpstats.go +++ b/pkg/sfu/buffer/rtpstats.go @@ -1677,7 +1677,7 @@ func (r *RTPStats) getAndResetSnapshot(snapshotId uint32, override bool) (*Snaps then := r.snapshots[snapshotId] if then == nil { - extStartSN := r.sequenceNumber.GetExtendedHighest() + extStartSN := r.sequenceNumber.GetExtendedStart() then = &Snapshot{ startTime: r.startTime, extStartSN: extStartSN, From 64bcef28aac144141cb36619cf878a9903a1d64a Mon Sep 17 00:00:00 2001 From: David Zhao Date: Sun, 27 Aug 2023 22:50:36 -0700 Subject: [PATCH 3/3] Address comments from #1998 (#2006) --- pkg/rtc/room.go | 2 +- pkg/sfu/buffer/rtpstats.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/rtc/room.go b/pkg/rtc/room.go index 7ee47bc22..4fadc21da 100644 --- a/pkg/rtc/room.go +++ b/pkg/rtc/room.go @@ -1331,7 +1331,7 @@ func BroadcastDataPacketForRoom(r types.Room, source types.LocalParticipant, dp utils.ParallelExec(destParticipants, dataForwardLoadBalanceThreshold, 1, func(op types.LocalParticipant) { err := op.SendDataPacket(dp, dpData) if err != nil && !errors.Is(err, io.ErrClosedPipe) && !errors.Is(err, psrpc.Canceled) && - errors.Is(err, psrpc.ErrStreamClosed) { + !errors.Is(err, psrpc.ErrStreamClosed) { op.GetLogger().Infow("send data packet error", "error", err) } }) diff --git a/pkg/sfu/buffer/rtpstats.go b/pkg/sfu/buffer/rtpstats.go index 9468e1b04..e070a6fb9 100644 --- a/pkg/sfu/buffer/rtpstats.go +++ b/pkg/sfu/buffer/rtpstats.go @@ -838,7 +838,7 @@ func (r *RTPStats) maybeAdjustFirstPacketTime(ets uint64) { "extStartTS", r.timestamp.GetExtendedStart(), ) if r.firstTime.Sub(firstTime) > firstPacketTimeAdjustThreshold { - r.logger.Debugw("first packet time adjustment too big, ignoring", + r.logger.Infow("first packet time adjustment too big, ignoring", "startTime", r.startTime.String(), "nowTime", now.String(), "before", r.firstTime.String(),