upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 20:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12668 from chlins/fix/preheat-delete-policy

Browse Source 
fix(preheat): check running executions when delete policy
This commit is contained in:
Steven Zou 2020-08-06 16:47:53 +08:00 committed by GitHub
commit 4f90ebce9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/v2.0/handler/preheat.go
View File

@ -275,6 +275,27 @@ func (api *preheatAPI) DeletePolicy(ctx context.Context, params operation.Delete
return api.SendError(ctx, err)
}
detectRunningExecutions := func(executions []*task.Execution) error {
for _, exec := range executions {
if exec.Status == job.RunningStatus.String() {
return fmt.Errorf("execution %d under the policy %s is running, stop it and retry", exec.ID, policy.Name)
}
}
return nil
}
executions, err := api.executionCtl.List(ctx, &q.Query{Keywords: map[string]interface{}{
"vendor_type": job.P2PPreheat,
"vendor_id": policy.ID,
}})
if err != nil {
return api.SendError(ctx, err)
}
// Detecting running tasks under the policy
if err = detectRunningExecutions(executions); err != nil {
return api.SendError(ctx, err)
}
err = api.preheatCtl.DeletePolicy(ctx, policy.ID)
if err != nil {
return api.SendError(ctx, err)