diff --git a/internal/db/models/dns/dns_task_dao.go b/internal/db/models/dns/dns_task_dao.go index 8683a69a..5f6bee03 100644 --- a/internal/db/models/dns/dns_task_dao.go +++ b/internal/db/models/dns/dns_task_dao.go @@ -94,8 +94,12 @@ func (this *DNSTaskDAO) FindAllDoingTasks(tx *dbs.Tx) (result []*DNSTask, err er } // FindAllDoingOrErrorTasks 查找正在执行的和错误的任务 -func (this *DNSTaskDAO) FindAllDoingOrErrorTasks(tx *dbs.Tx) (result []*DNSTask, err error) { - _, err = this.Query(tx). +func (this *DNSTaskDAO) FindAllDoingOrErrorTasks(tx *dbs.Tx, nodeClusterId int64) (result []*DNSTask, err error) { + var query = this.Query(tx) + if nodeClusterId > 0 { + query.Attr("clusterId", nodeClusterId) + } + _, err = query. Where("(isDone=0 OR (isDone=1 AND isOk=0))"). AscPk(). Slice(&result). diff --git a/internal/rpc/services/service_dns_task.go b/internal/rpc/services/service_dns_task.go index 1e03def6..14ce87b2 100644 --- a/internal/rpc/services/service_dns_task.go +++ b/internal/rpc/services/service_dns_task.go @@ -8,12 +8,12 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) -// DNS同步相关任务 +// DNSTaskService DNS同步相关任务 type DNSTaskService struct { BaseService } -// 检查是否有正在执行的任务 +// ExistsDNSTasks 检查是否有正在执行的任务 func (this *DNSTaskService) ExistsDNSTasks(ctx context.Context, req *pb.ExistsDNSTasksRequest) (*pb.ExistsDNSTasksResponse, error) { _, err := this.ValidateAdmin(ctx, 0) if err != nil { @@ -37,7 +37,7 @@ func (this *DNSTaskService) ExistsDNSTasks(ctx context.Context, req *pb.ExistsDN }, nil } -// 查找正在执行的所有任务 +// FindAllDoingDNSTasks 查找正在执行的所有任务 func (this *DNSTaskService) FindAllDoingDNSTasks(ctx context.Context, req *pb.FindAllDoingDNSTasksRequest) (*pb.FindAllDoingDNSTasksResponse, error) { _, err := this.ValidateAdmin(ctx, 0) if err != nil { @@ -45,7 +45,7 @@ func (this *DNSTaskService) FindAllDoingDNSTasks(ctx context.Context, req *pb.Fi } var tx = this.NullTx() - tasks, err := dns.SharedDNSTaskDAO.FindAllDoingOrErrorTasks(tx) + tasks, err := dns.SharedDNSTaskDAO.FindAllDoingOrErrorTasks(tx, req.NodeClusterId) if err != nil { return nil, err } @@ -104,7 +104,7 @@ func (this *DNSTaskService) FindAllDoingDNSTasks(ctx context.Context, req *pb.Fi return &pb.FindAllDoingDNSTasksResponse{DnsTasks: pbTasks}, nil } -// 删除任务 +// DeleteDNSTask 删除任务 func (this *DNSTaskService) DeleteDNSTask(ctx context.Context, req *pb.DeleteDNSTaskRequest) (*pb.RPCSuccess, error) { _, err := this.ValidateAdmin(ctx, 0) if err != nil {