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

fix: refresh after created and deleted migration task

This commit is contained in:
liugq 2024-03-26 18:43:29 +08:00
parent f36e088f4e
commit 50c3539cb0
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/task_manager/cluster_comparison/orm.go
View File

@ -56,7 +56,10 @@ func CreateTask(config *migration_model.ClusterComparisonTaskConfig, creator *rb
return nil, fmt.Errorf("repeat invalid: %v", err) return nil, fmt.Errorf("repeat invalid: %v", err)
} }
err = orm.Create(nil, t) ctx := &orm.Context{
Refresh: "wait_for",
}
err = orm.Create(ctx, t)
if err != nil { if err != nil {
return nil, err return nil, err
} }

5
plugin/task_manager/cluster_migration/orm.go
View File

@ -56,7 +56,10 @@ func CreateTask(config *migration_model.ClusterMigrationTaskConfig, creator *rba
return nil, fmt.Errorf("repeat invalid: %v", err) return nil, fmt.Errorf("repeat invalid: %v", err)
} }
err = orm.Create(nil, t) ctx := &orm.Context{
Refresh: "wait_for",
}
err = orm.Create(ctx, t)
if err != nil { if err != nil {
return nil, err return nil, err
} }

32
plugin/task_manager/common_api.go
View File

@ -206,7 +206,10 @@ func (h *APIHandler) startTask(w http.ResponseWriter, req *http.Request, ps http
} }
} }
err = orm.Update(nil, &obj) ctx := &orm.Context{
Refresh: "wait_for",
}
err = orm.Update(ctx, &obj)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
h.WriteError(w, err.Error(), http.StatusInternalServerError) h.WriteError(w, err.Error(), http.StatusInternalServerError)
@ -264,12 +267,19 @@ func (h *APIHandler) deleteTask(w http.ResponseWriter, req *http.Request, ps htt
h.WriteError(w, fmt.Sprintf("can not delete task [%s] with status [%s]", obj.ID, obj.Status), http.StatusInternalServerError) h.WriteError(w, fmt.Sprintf("can not delete task [%s] with status [%s]", obj.ID, obj.Status), http.StatusInternalServerError)
return return
} }
ctx := &orm.Context{
Refresh: "wait_for",
}
err = orm.Delete(ctx, &obj)
if err != nil {
log.Error(err)
h.WriteError(w, err.Error(), http.StatusInternalServerError)
return
}
q := util.MapStr{ q := util.MapStr{
"query": util.MapStr{ "query": util.MapStr{
"bool": util.MapStr{ "bool": util.MapStr{
"minimum_should_match": 1, "must": []util.MapStr{
"should": []util.MapStr{
{ {
"term": util.MapStr{ "term": util.MapStr{
"parent_id": util.MapStr{ "parent_id": util.MapStr{
@ -277,22 +287,13 @@ func (h *APIHandler) deleteTask(w http.ResponseWriter, req *http.Request, ps htt
}, },
}, },
}, },
{
"term": util.MapStr{
"id": util.MapStr{
"value": id,
},
},
},
}, },
}, },
}, },
} }
err = orm.DeleteBy(&obj, util.MustToJSONBytes(q)) err = orm.DeleteBy(&obj, util.MustToJSONBytes(q))
if err != nil { if err != nil {
h.WriteError(w, err.Error(), http.StatusInternalServerError)
log.Error(err) log.Error(err)
return
} }
h.WriteJSON(w, util.MapStr{ h.WriteJSON(w, util.MapStr{
@ -337,7 +338,10 @@ func (h *APIHandler) resumeTask(w http.ResponseWriter, req *http.Request, ps htt
} }
lastRepeatingChild.Metadata.Labels["repeat_triggered"] = false lastRepeatingChild.Metadata.Labels["repeat_triggered"] = false
err = orm.Update(nil, lastRepeatingChild) ctx := &orm.Context{
Refresh: "wait_for",
}
err = orm.Update(ctx, lastRepeatingChild)
if err != nil { if err != nil {
log.Errorf("failed to update last child, err: %v", err) log.Errorf("failed to update last child, err: %v", err)
h.WriteError(w, err.Error(), http.StatusInternalServerError) h.WriteError(w, err.Error(), http.StatusInternalServerError)