git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-28 17:50:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: updated task related grpc proto

Browse Source
This commit is contained in:
Marvin Zhang
2024-10-29 17:59:39 +08:00
parent 3aa32a14ad
commit 789f71fd80
9 changed files with 61 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/task/handler/runner_v2.go
View File

@@ -166,11 +166,11 @@ func (r *RunnerV2) Run() (err error) {
return err
}
func (r *RunnerV2) Cancel() (err error) {
func (r *RunnerV2) Cancel(force bool) (err error) {
// kill process
opts := &sys_exec.KillProcessOptions{
Timeout: r.svc.GetCancelTimeout(),
Force: true,
Force: force,
}
if err := sys_exec.KillProcess(r.cmd, opts); err != nil {
return err

4
core/task/handler/service_v2.go
View File

@@ -66,12 +66,12 @@ func (svc *ServiceV2) Reset() {
defer svc.mu.Unlock()
}
func (svc *ServiceV2) Cancel(taskId primitive.ObjectID) (err error) {
func (svc *ServiceV2) Cancel(taskId primitive.ObjectID, force bool) (err error) {
r, err := svc.getRunner(taskId)
if err != nil {
return err
}
if err := r.Cancel(); err != nil {
if err := r.Cancel(force); err != nil {
return err
}
return nil

6
core/task/scheduler/service_v2.go
View File

@@ -12,7 +12,7 @@ import (
nodeconfig "github.com/crawlab-team/crawlab/core/node/config"
"github.com/crawlab-team/crawlab/core/task/handler"
"github.com/crawlab-team/crawlab/core/utils"
grpc "github.com/crawlab-team/crawlab/grpc"
"github.com/crawlab-team/crawlab/grpc"
"github.com/crawlab-team/crawlab/trace"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
@@ -80,7 +80,7 @@ func (svc *ServiceV2) Enqueue(t *models2.TaskV2, by primitive.ObjectID) (t2 *mod
return t, nil
}
func (svc *ServiceV2) Cancel(id primitive.ObjectID, by primitive.ObjectID) (err error) {
func (svc *ServiceV2) Cancel(id primitive.ObjectID, by primitive.ObjectID, force bool) (err error) {
// task
t, err := service.NewModelServiceV2[models2.TaskV2]().GetById(id)
if err != nil {
@@ -119,7 +119,7 @@ func (svc *ServiceV2) Cancel(id primitive.ObjectID, by primitive.ObjectID) (err
if isMasterTask {
// cancel task on master
if err := svc.handlerSvc.Cancel(id); err != nil {
if err := svc.handlerSvc.Cancel(id, force); err != nil {
return trace.TraceError(err)
}
// cancel success