floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[migration] don't filter out non-running pipeline task

This commit is contained in:
Kassian Sun 2023-05-26 16:02:33 +08:00 committed by Gitea
parent 241c9f57fb
commit dd98ba7dff
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugin/migration/api.go
View File

@ -487,7 +487,7 @@ func (h *APIHandler) refreshIndex(w http.ResponseWriter, req *http.Request, ps h
}, 200) }, 200)
} }
func (h *APIHandler) getChildTaskInfosByIndex(taskItem *task2.Task, uniqueIndexName string) (subTasks []task2.Task, pipelineTaskIDs map[string][]string, pipelineSubParentIDs map[string]string, parentIDPipelineTasks map[string][]task2.Task, err error) { func (h *APIHandler) getChildTaskInfosByIndex(taskItem *task2.Task, uniqueIndexName string) (subTasks []task2.Task, runningPipelineTaskIDs map[string][]string, pipelineSubParentIDs map[string]string, parentIDPipelineTasks map[string][]task2.Task, err error) {
queryDsl := util.MapStr{ queryDsl := util.MapStr{
"size": 9999, "size": 9999,
"sort": []util.MapStr{ "sort": []util.MapStr{
@ -526,7 +526,7 @@ func (h *APIHandler) getChildTaskInfosByIndex(taskItem *task2.Task, uniqueIndexN
return return
} }
pipelineTaskIDs = map[string][]string{} runningPipelineTaskIDs = map[string][]string{}
pipelineSubParentIDs = map[string]string{} pipelineSubParentIDs = map[string]string{}
parentIDPipelineTasks = map[string][]task2.Task{} parentIDPipelineTasks = map[string][]task2.Task{}
@ -543,9 +543,6 @@ func (h *APIHandler) getChildTaskInfosByIndex(taskItem *task2.Task, uniqueIndexN
subTasks = append(subTasks, subTask) subTasks = append(subTasks, subTask)
continue continue
} }
if subTask.Status != task2.StatusRunning {
continue
}
// TODO: use more robust logic // TODO: use more robust logic
if pl := len(subTask.ParentId); pl != 2 { if pl := len(subTask.ParentId); pl != 2 {
@ -558,7 +555,9 @@ func (h *APIHandler) getChildTaskInfosByIndex(taskItem *task2.Task, uniqueIndexN
if instID == "" { if instID == "" {
continue continue
} }
pipelineTaskIDs[instID] = append(pipelineTaskIDs[instID], subTask.ID) if subTask.Status == task2.StatusRunning {
runningPipelineTaskIDs[instID] = append(runningPipelineTaskIDs[instID], subTask.ID)
}
parentIDPipelineTasks[parentID] = append(parentIDPipelineTasks[parentID], subTask) parentIDPipelineTasks[parentID] = append(parentIDPipelineTasks[parentID], subTask)
} }