Infrastructure/zot
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2024-12-16 21:56:37 -05:00
Code Issues Activity

fix: high CPU utilization by scheduler while idle (#2156)

Browse source 
resolves #2155

Signed-off-by: Andrei Aaron <aaaron@luxoft.com>
This commit is contained in:
Andrei Aaron 2024-01-11 19:30:16 +02:00 committed by GitHub
parent 77d68297cf
commit 2a6bf66cb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/exporter/api/controller_test.go
View file

@ -134,6 +134,8 @@ func TestNewExporter(t *testing.T) {
baseURL := fmt.Sprintf(BaseURL, serverPort)
servercConfig.HTTP.Port = serverPort
servercConfig.BinaryType = "minimal"
servercConfig.Storage.Dedupe = false
servercConfig.Storage.GC = false
serverController := zotapi.NewController(servercConfig)
So(serverController, ShouldNotBeNil)

14
pkg/scheduler/scheduler.go
View file

@ -60,7 +60,7 @@ func (pq *generatorsPriorityQueue) Pop() any {
const (
rateLimiterScheduler = 400
rateLimit = 5 * time.Second
rateLimit = 50 * time.Millisecond
NumWorkersMultiplier = 4
sendMetricsInterval = 5 * time.Second
)
@ -241,7 +241,7 @@ func (scheduler *Scheduler) RunScheduler() {
ctx, cancel := context.WithCancel(context.Background())
scheduler.cancelFunc = cancel
throttle := time.NewTicker(rateLimit).C
throttle := time.NewTicker(scheduler.RateLimit).C
numWorkers := scheduler.NumWorkers
@ -278,10 +278,14 @@ func (scheduler *Scheduler) RunScheduler() {
task := scheduler.getTask()
if task != nil {
// push tasks into worker pool until workerChan is full.
scheduler.workerChan <- task
if task == nil {
<-throttle
continue
}
// push tasks into worker pool until workerChan is full.
scheduler.workerChan <- task
}
}
}()

9
pkg/scheduler/scheduler_test.go
View file

@ -130,10 +130,10 @@ func TestScheduler(t *testing.T) {
genH := &shortGenerator{log: logger, priority: "high priority"}
// interval has to be higher than throttle value to simulate
sch.SubmitGenerator(genH, 6*time.Second, scheduler.HighPriority)
sch.SubmitGenerator(genH, 1*time.Second, scheduler.HighPriority)
sch.RunScheduler()
time.Sleep(7 * time.Second)
time.Sleep(2 * time.Second)
sch.Shutdown()
data, err := os.ReadFile(logFile.Name())
@ -152,6 +152,7 @@ func TestScheduler(t *testing.T) {
cfg.Scheduler = &config.SchedulerConfig{NumWorkers: 3}
metrics := monitoring.NewMetricsServer(true, logger)
sch := scheduler.NewScheduler(cfg, metrics, logger)
sch.RateLimit = 5 * time.Second
genL := &generator{log: logger, priority: "low priority"}
sch.SubmitGenerator(genL, time.Duration(0), scheduler.LowPriority)
@ -212,7 +213,7 @@ func TestScheduler(t *testing.T) {
sch.SubmitGenerator(genL, 20*time.Millisecond, scheduler.LowPriority)
sch.RunScheduler()
time.Sleep(4 * time.Second)
time.Sleep(1 * time.Second)
sch.Shutdown()
data, err := os.ReadFile(logFile.Name())
@ -275,7 +276,7 @@ func TestScheduler(t *testing.T) {
sch.SubmitGenerator(genL, 20*time.Millisecond, scheduler.MediumPriority)
sch.RunScheduler()
time.Sleep(4 * time.Second)
time.Sleep(1 * time.Second)
sch.Shutdown()
data, err := os.ReadFile(logFile.Name())