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

Merge pull request '[migration] tune cleaning gateway error logs' (#76) from fix/migration into master

This commit is contained in:
silenceqi 2023-04-22 15:40:03 +08:00
parent da908cebfb 20498e2e76
commit 5f8ab9859b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/migration/pipeline.go
View File

@ -1333,12 +1333,11 @@ func (p *DispatcherProcessor) refreshInstanceJobsFromES() error {
func (p *DispatcherProcessor) cleanGatewayQueue(taskItem *task2.Task) { func (p *DispatcherProcessor) cleanGatewayQueue(taskItem *task2.Task) {
var err error var err error
instance := model.Instance{} instance := model.Instance{}
instanceID := taskItem.Metadata.Labels["execution_instance_id"] instance.ID, _ = util.ExtractString(taskItem.Metadata.Labels["execution_instance_id"])
if instanceID == "" { if instance.ID == "" {
log.Debugf("task [%s] not scheduled yet, skip cleaning queue", taskItem.ID) log.Debugf("task [%s] not scheduled yet, skip cleaning queue", taskItem.ID)
return return
} }
instance.ID, _ = util.ExtractString(instanceID)
_, err = orm.Get(&instance) _, err = orm.Get(&instance)
if err != nil { if err != nil {
log.Errorf("failed to get instance, err: %v", err) log.Errorf("failed to get instance, err: %v", err)

3
plugin/migration/pipeline_task/pipeline_task.go
View File

@ -218,8 +218,9 @@ func (p *processor) cleanGatewayPipeline(taskItem *task.Task) (instance model.In
return return
} }
err = instance.DeletePipeline(taskItem.ID) err = instance.DeletePipeline(taskItem.ID)
if err != nil { if err != nil && !strings.Contains(err.Error(), "task not found") {
log.Errorf("delete pipeline failed, err: %v", err) log.Errorf("delete pipeline failed, err: %v", err)
return
} }
return instance, nil return instance, nil