Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CanAccept logic #159

Merged
merged 1 commit into from
Oct 27, 2023
Merged

Fix CanAccept logic #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions pkg/stats/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ import (
"github.com/livekit/protocol/utils"
)

const (
minIdle float64 = 0.3 // Target at least 30% idle CPU
)

type Monitor struct {
cpuCostConfig config.CPUCostConfig
maxCost float64
Expand Down Expand Up @@ -59,8 +63,9 @@ func (m *Monitor) Start(conf *config.Config) error {
return err
}
m.cpuStats = cpuStats
m.cpuCostConfig = conf.CPUCost

if err := m.checkCPUConfig(conf.CPUCost); err != nil {
if err := m.checkCPUConfig(); err != nil {
return err
}

Expand Down Expand Up @@ -110,44 +115,44 @@ func (m *Monitor) Stop() {
prometheus.Unregister(m.promNodeAvailable)
}

func (m *Monitor) checkCPUConfig(costConfig config.CPUCostConfig) error {
if costConfig.RTMPCpuCost < 1 {
func (m *Monitor) checkCPUConfig() error {
if m.cpuCostConfig.RTMPCpuCost < 1 {
logger.Warnw("rtmp input requirement too low", nil,
"config value", costConfig.RTMPCpuCost,
"config value", m.cpuCostConfig.RTMPCpuCost,
"minimum value", 1,
"recommended value", 2,
)
}

if costConfig.WHIPCpuCost < 1 {
if m.cpuCostConfig.WHIPCpuCost < 1 {
logger.Warnw("whip input requirement too low", nil,
"config value", costConfig.WHIPCpuCost,
"config value", m.cpuCostConfig.WHIPCpuCost,
"minimum value", 1,
"recommended value", 2,
)
}

if costConfig.WHIPBypassTranscodingCpuCost < 0.05 {
if m.cpuCostConfig.WHIPBypassTranscodingCpuCost < 0.05 {
logger.Warnw("whip input with transcoding bypassed requirement too low", nil,
"config value", costConfig.WHIPCpuCost,
"config value", m.cpuCostConfig.WHIPCpuCost,
"minimum value", 0.05,
"recommended value", 0.1,
)
}

if costConfig.URLCpuCost < 1 {
if m.cpuCostConfig.URLCpuCost < 1 {
logger.Warnw("url input requirement too low", nil,
"config value", costConfig.URLCpuCost,
"config value", m.cpuCostConfig.URLCpuCost,
"minimum value", 1,
"recommended value", 2,
)
}

requirements := []float64{
costConfig.RTMPCpuCost,
costConfig.WHIPCpuCost,
costConfig.WHIPBypassTranscodingCpuCost,
costConfig.URLCpuCost,
m.cpuCostConfig.RTMPCpuCost,
m.cpuCostConfig.WHIPCpuCost,
m.cpuCostConfig.WHIPBypassTranscodingCpuCost,
m.cpuCostConfig.URLCpuCost,
}
sort.Float64s(requirements)
m.maxCost = requirements[len(requirements)-1]
Expand Down Expand Up @@ -200,7 +205,7 @@ func (m *Monitor) canAcceptIngress(info *livekit.IngressInfo) (bool, float64, fl

var cpuHold float64
var accept bool
available := m.cpuStats.GetCPUIdle() - m.pendingCPUs.Load()
available := m.cpuStats.GetCPUIdle() - m.pendingCPUs.Load() - minIdle*m.cpuStats.NumCPU()

switch info.InputType {
case livekit.IngressInput_RTMP_INPUT:
Expand Down