github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-17 12:58:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(test): add lint rule for messages starting with the component (#2045)

Browse Source 
Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>
Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>
Signed-off-by: Andrei Aaron <aaaron@luxoft.com>
This commit is contained in:
LaurentiuNiculae
2023-12-08 00:05:02 -08:00
committed by GitHub
parent 262a904286
commit 79e14027ee
81 changed files with 855 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/scheduler.go
+8 -8
View File
@@ -128,7 +128,7 @@ func (scheduler *Scheduler) poolWorker(ctx context.Context) {
for task := range scheduler.workerChan {
// leave below line here (for zot minimal metrics can be enabled on first scraping)
metricsEnabled := scheduler.metricServer.IsEnabled()
scheduler.log.Debug().Int("worker", workerID).Str("task", task.String()).Msg("scheduler: starting task")
scheduler.log.Debug().Int("worker", workerID).Str("task", task.String()).Msg("starting task")
if metricsEnabled {
scheduler.tasksLock.Lock()
@@ -139,7 +139,7 @@ func (scheduler *Scheduler) poolWorker(ctx context.Context) {
if err := task.DoWork(ctx); err != nil {
scheduler.log.Error().Int("worker", workerID).Str("task", task.String()).Err(err).
Msg("scheduler: error while executing task")
Msg("failed to execute task")
}
if metricsEnabled {
@@ -150,7 +150,7 @@ func (scheduler *Scheduler) poolWorker(ctx context.Context) {
monitoring.ObserveWorkersTasksDuration(scheduler.metricServer, task.Name(), workDuration)
}
scheduler.log.Debug().Int("worker", workerID).Str("task", task.String()).Msg("scheduler: finished task")
scheduler.log.Debug().Int("worker", workerID).Str("task", task.String()).Msg("finished task")
}
}(i + 1)
}
@@ -250,7 +250,7 @@ func (scheduler *Scheduler) RunScheduler(ctx context.Context) {
scheduler.shutdown()
}
scheduler.log.Debug().Msg("scheduler: received stop signal, gracefully shutting down...")
scheduler.log.Debug().Msg("received stop signal, gracefully shutting down...")
return
default:
@@ -261,7 +261,7 @@ func (scheduler *Scheduler) RunScheduler(ctx context.Context) {
if task != nil {
// push tasks into worker pool
if !scheduler.inShutdown() {
scheduler.log.Debug().Str("task", task.String()).Msg("scheduler: pushing task into worker pool")
scheduler.log.Debug().Str("task", task.String()).Msg("pushing task into worker pool")
scheduler.workerChan <- task
}
}
@@ -286,7 +286,7 @@ func (scheduler *Scheduler) pushReadyGenerators() {
scheduler.waitingGenerators = append(scheduler.waitingGenerators[:i], scheduler.waitingGenerators[i+1:]...)
modified = true
scheduler.log.Debug().Msg("scheduler: waiting generator is ready, pushing to ready generators")
scheduler.log.Debug().Msg("waiting generator is ready, pushing to ready generators")
break
}
@@ -383,7 +383,7 @@ func (scheduler *Scheduler) SubmitTask(task Task, priority Priority) {
select {
case tasksQ <- task:
scheduler.log.Info().Msg("scheduler: adding a new task")
scheduler.log.Info().Msg("adding a new task")
default:
if scheduler.inShutdown() {
return
@@ -434,7 +434,7 @@ func (gen *generator) generate(sch *Scheduler) {
if gen.remainingTask == nil {
nextTask, err := gen.taskGenerator.Next()
if err != nil {
sch.log.Error().Err(err).Msg("scheduler: error while executing generator")
sch.log.Error().Err(err).Msg("failed to execute generator")
return
}
pkg/scheduler/scheduler_test.go
+5 -5
View File
@@ -161,7 +161,7 @@ func TestScheduler(t *testing.T) {
So(string(data), ShouldContainSubstring, "executing high priority task; index: 1")
So(string(data), ShouldContainSubstring, "executing high priority task; index: 2")
So(string(data), ShouldNotContainSubstring, "executing medium priority task; index: 1")
So(string(data), ShouldNotContainSubstring, "error while executing task")
So(string(data), ShouldNotContainSubstring, "failed to execute task")
})
Convey("Test task returning an error", t, func() {
@@ -185,8 +185,8 @@ func TestScheduler(t *testing.T) {
data, err := os.ReadFile(logFile.Name())
So(err, ShouldBeNil)
So(string(data), ShouldContainSubstring, "scheduler: adding a new task")
So(string(data), ShouldContainSubstring, "error while executing task")
So(string(data), ShouldContainSubstring, "adding a new task")
So(string(data), ShouldContainSubstring, "failed to execute task")
})
Convey("Test resubmit generator", t, func() {
@@ -229,7 +229,7 @@ func TestScheduler(t *testing.T) {
data, err := os.ReadFile(logFile.Name())
So(err, ShouldBeNil)
So(string(data), ShouldNotContainSubstring, "scheduler: adding a new task")
So(string(data), ShouldNotContainSubstring, "adding a new task")
})
Convey("Test adding a new task when context is done", t, func() {
@@ -253,7 +253,7 @@ func TestScheduler(t *testing.T) {
data, err := os.ReadFile(logFile.Name())
So(err, ShouldBeNil)
So(string(data), ShouldNotContainSubstring, "scheduler: adding a new task")
So(string(data), ShouldNotContainSubstring, "adding a new task")
})
Convey("Test scheduler Priority.String() method", t, func() {