Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Stop Pending Job cannot update status (#17842) 

Convert the redis range result into struct and extract job id from it
  Add more log when get redis config fails

Signed-off-by: stonezdj <daojunz@vmware.com>

Signed-off-by: stonezdj <daojunz@vmware.com>
This commit is contained in:
stonezdj(Daojun Zhang) 2022-11-24 20:29:50 +08:00 committed by GitHub
parent d079034b23
commit 619747fc68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/job/client.go
View File

@ -15,6 +15,7 @@ import (
"github.com/goharbor/harbor/src/common/job/models"
"github.com/goharbor/harbor/src/jobservice/job"
"github.com/goharbor/harbor/src/lib/config"
"github.com/goharbor/harbor/src/lib/log"
)
var (
@ -231,6 +232,7 @@ func (d *DefaultClient) GetJobServiceConfig() (*job.Config, error) {
return nil, err
}
if resp.StatusCode != http.StatusOK {
log.Infof("failed to get job service config from jobservice:8080/api/v1/config, job service container version maybe mismatch")
return nil, &commonhttp.Error{
Code: resp.StatusCode,
Message: string(data),

2
src/controller/jobmonitor/monitor.go
View File

@ -55,7 +55,7 @@ type MonitorController interface {
// ListWorkers lists the workers in the pool
ListWorkers(ctx context.Context, poolID string) ([]*jm.Worker, error)
// StopRunningJob stop the running job
// StopRunningJobs stop the running job
StopRunningJobs(ctx context.Context, jobID string) error
// StopPendingJobs stop the pending jobs
StopPendingJobs(ctx context.Context, jobType string) error

19
src/pkg/jobmonitor/redis.go
View File

@ -16,6 +16,7 @@ package jobmonitor
import (
"context"
"encoding/json"
"fmt"
"time"
@ -69,10 +70,24 @@ func (r *redisClientImpl) StopPendingJobs(ctx context.Context, jobType string) (
redisKeyJobQueue := fmt.Sprintf("{%s}:jobs:%v", r.namespace, jobType)
conn := r.redisPool.Get()
defer conn.Close()
jobIDs, err = redis.Strings(conn.Do("LRANGE", redisKeyJobQueue, 0, -1))
var jobInfo struct {
ID string `json:"id"`
}
jobs, err := redis.Strings(conn.Do("LRANGE", redisKeyJobQueue, 0, -1))
if err != nil {
return []string{}, err
}
if len(jobs) == 0 {
log.Infof("no pending job for job type %v", jobType)
return []string{}, nil
}
for _, j := range jobs {
if err := json.Unmarshal([]byte(j), &jobInfo); err != nil {
log.Errorf("failed to parse the job info %v, %v", j, err)
continue
}
jobIDs = append(jobIDs, jobInfo.ID)
}
log.Infof("updated %d tasks in pending status to stop", len(jobIDs))
ret, err := redis.Int64(conn.Do("DEL", redisKeyJobQueue))
if err != nil {
@ -83,6 +98,7 @@ func (r *redisClientImpl) StopPendingJobs(ctx context.Context, jobType string) (
return []string{}, fmt.Errorf("no job in the queue removed")
}
log.Infof("deleted %d keys in waiting queue for %s", ret, jobType)
log.Debugf("job id to be deleted %v", jobIDs)
return jobIDs, nil
}
@ -110,6 +126,7 @@ func (r *redisClientImpl) UnpauseJob(ctx context.Context, jobName string) error
return err
}
// JobServiceRedisClient function to create redis client for job service
func JobServiceRedisClient() (RedisClient, error) {
cfg, err := job.GlobalClient.GetJobServiceConfig()
if err != nil {