diff --git a/pkg/sfu/streamallocator/probe_controller.go b/pkg/sfu/streamallocator/probe_controller.go index 7426683c5..0a49af5de 100644 --- a/pkg/sfu/streamallocator/probe_controller.go +++ b/pkg/sfu/streamallocator/probe_controller.go @@ -65,6 +65,7 @@ func (p *ProbeController) Reset() { p.resetProbeIntervalLocked() p.resetProbeDurationLocked() + p.StopProbe() p.clearProbeLocked() } @@ -73,7 +74,7 @@ func (p *ProbeController) ProbeClusterDone(info ProbeClusterInfo) { defer p.lock.Unlock() if p.probeClusterId != info.Id { - p.params.Logger.Infow("not expected probe cluster", "probeClusterId", p.probeClusterId, "resetProbeClusterId", info.Id) + p.params.Logger.Debugw("not expected probe cluster", "probeClusterId", p.probeClusterId, "resetProbeClusterId", info.Id) return } @@ -138,7 +139,9 @@ func (p *ProbeController) MaybeFinalizeProbe( return true, true, true } - if (isComplete || p.abortedProbeClusterId != ProbeClusterIdInvalid) && p.probeEndTime.IsZero() && p.doneProbeClusterInfo.Id != ProbeClusterIdInvalid && p.doneProbeClusterInfo.Id == p.probeClusterId { + if (isComplete || p.abortedProbeClusterId != ProbeClusterIdInvalid) && + p.probeEndTime.IsZero() && + p.doneProbeClusterInfo.Id != ProbeClusterIdInvalid && p.doneProbeClusterInfo.Id == p.probeClusterId { // ensure any queueing due to probing is flushed // STREAM-ALLOCATOR-TODO: CongestionControlProbeConfig.SettleWait should actually be a certain number of RTTs. expectedDuration := float64(9.0) @@ -165,7 +168,7 @@ func (p *ProbeController) MaybeFinalizeProbe( } if !p.probeEndTime.IsZero() && time.Now().After(p.probeEndTime) { - // finalisze aborted or non-failing but non-goal-reached probe cluster + // finalize aborted or non-failing but non-goal-reached probe cluster return true, p.finalizeProbeLocked(trend), false }