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

increase cpu hold duration #564

Closed
wants to merge 2 commits into from
Closed

increase cpu hold duration #564

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f5f461
increase cpu hold duration
frostbyte73 Dec 15, 2023
e0f40d3
new strategy
frostbyte73 Dec 15, 2023
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
68 changes: 39 additions & 29 deletions pkg/stats/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package stats

import (
"fmt"
"math"
"sort"
"sync"
"time"
Expand Down Expand Up @@ -47,7 +48,7 @@ type Monitor struct {
prevEgressUsage map[string]float64
}

const cpuHoldDuration = time.Second * 5
const cpuHoldDuration = time.Second * 30

func NewMonitor(conf *config.ServiceConfig) *Monitor {
return &Monitor{
Expand Down Expand Up @@ -176,39 +177,41 @@ func (m *Monitor) CanAcceptRequest(req *rpc.StartEgressRequest) bool {
}

func (m *Monitor) canAcceptRequest(req *rpc.StartEgressRequest) bool {
accept := false

total := m.cpuStats.NumCPU()
available := m.cpuStats.GetCPUIdle() - m.pendingCPUs.Load()
available := math.Min(m.getAvailableCPU(), m.cpuStats.NumCPU()-m.pendingCPUs.Load())

logger.Debugw("cpu check",
"total", total,
"total", m.cpuStats.NumCPU(),
"available", available,
"active_requests", m.requests,
"requests", m.requests,
)

if m.requests.Load() == 0 {
// if no requests, use total
available = total
} else {
// if already running requests, cap usage at MaxCpuUtilization
available -= (1 - m.cpuCostConfig.MaxCpuUtilization) * total
}

switch req.Request.(type) {
case *rpc.StartEgressRequest_RoomComposite:
accept = available >= m.cpuCostConfig.RoomCompositeCpuCost
return available >= m.cpuCostConfig.RoomCompositeCpuCost
case *rpc.StartEgressRequest_Web:
accept = available >= m.cpuCostConfig.WebCpuCost
return available >= m.cpuCostConfig.WebCpuCost
case *rpc.StartEgressRequest_Participant:
accept = available >= m.cpuCostConfig.ParticipantCpuCost
return available >= m.cpuCostConfig.ParticipantCpuCost
case *rpc.StartEgressRequest_TrackComposite:
accept = available >= m.cpuCostConfig.TrackCompositeCpuCost
return available >= m.cpuCostConfig.TrackCompositeCpuCost
case *rpc.StartEgressRequest_Track:
accept = available >= m.cpuCostConfig.TrackCpuCost
return available >= m.cpuCostConfig.TrackCpuCost
default:
logger.Warnw("unrecognized request type", nil)
return false
}
}

func (m *Monitor) getAvailableCPU() float64 {
total := m.cpuStats.NumCPU()

// if no requests, use total
if m.requests.Load() == 0 {
return total
}

return accept
// if already running requests, cap usage at MaxCpuUtilization
return m.cpuStats.GetCPUIdle() - (1-m.cpuCostConfig.MaxCpuUtilization)*total
}

func (m *Monitor) AcceptRequest(req *rpc.StartEgressRequest) error {
Expand All @@ -219,23 +222,30 @@ func (m *Monitor) AcceptRequest(req *rpc.StartEgressRequest) error {
return errors.ErrResourceExhausted
}

var cpuHold float64
pending := m.getAvailableCPU()
switch req.Request.(type) {
case *rpc.StartEgressRequest_RoomComposite:
cpuHold = m.cpuCostConfig.RoomCompositeCpuCost
pending = m.cpuCostConfig.RoomCompositeCpuCost
case *rpc.StartEgressRequest_Web:
cpuHold = m.cpuCostConfig.WebCpuCost
pending = m.cpuCostConfig.WebCpuCost
case *rpc.StartEgressRequest_Participant:
cpuHold = m.cpuCostConfig.ParticipantCpuCost
pending = m.cpuCostConfig.ParticipantCpuCost
case *rpc.StartEgressRequest_TrackComposite:
cpuHold = m.cpuCostConfig.TrackCompositeCpuCost
pending = m.cpuCostConfig.TrackCompositeCpuCost
case *rpc.StartEgressRequest_Track:
cpuHold = m.cpuCostConfig.TrackCpuCost
pending = m.cpuCostConfig.TrackCpuCost
}

m.requests.Inc()
m.pendingCPUs.Add(cpuHold)
time.AfterFunc(cpuHoldDuration, func() { m.pendingCPUs.Sub(cpuHold) })
m.pendingCPUs.Store(pending)
time.AfterFunc(cpuHoldDuration, func() {
m.mu.Lock()
if m.pendingCPUs.Load() == pending {
m.pendingCPUs.Store(0)
}
m.mu.Unlock()
})

return nil
}

Expand Down