From f06b76bf28b6db5c5c674eae81a20bf3287d02ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E9=B8=BF=E9=A3=9E?= Date: Fri, 19 May 2023 15:45:50 +0800 Subject: [PATCH] fxi(scheduledtask): skip task when scheduledtask.labels is empty --- pkg/scheduledtask/models/scheduled_tasks.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/scheduledtask/models/scheduled_tasks.go b/pkg/scheduledtask/models/scheduled_tasks.go index 28800198cf..aa37b66c1f 100644 --- a/pkg/scheduledtask/models/scheduled_tasks.go +++ b/pkg/scheduledtask/models/scheduled_tasks.go @@ -554,6 +554,16 @@ func (stm *SScheduledTaskManager) Timer(ctx context.Context, userCred mcclient.T waitQueue := make(chan struct{}, len(sts)) for i := range sts { log.Infof("sts[%d]: %s", i, jsonutils.Marshal(sts[i])) + // 对于关联资源为空或获取关联资源异常的定时任务，不执行 + lables, err := sts[i].Labels() + if err != nil { + log.Errorf("scheduled_task get lables error:%s", err.Error()) + continue + } + if len(lables) == 0 { + log.Errorf("scheduled_task %s lables not found:", sts[i].Id) + continue + } st := sts[i] timerQueue <- struct{}{} waitQueue <- struct{}{}