zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-05 13:46:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #246 from onepanelio/fix/delete.scheduled.cron

Browse Source 
Fixed TerminateCronWorkflow
This commit is contained in:
Rush Tehrani
2020-05-22 20:22:45 -07:00
committed by GitHub
parent 037e735b6b b712ba676a
commit 8ba2f9f6a1
2 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
pkg/cron_workflow.go
View File

@@ -513,13 +513,45 @@ func (c *Client) createCronWorkflow(namespace string, workflowTemplateId *uint64
func (c *Client) TerminateCronWorkflow(namespace, uid string) (err error) {
err = c.ArgoprojV1alpha1().CronWorkflows(namespace).Delete(uid, nil)
if err != nil {
if strings.Contains(err.Error(), "not found") {
return nil
if !strings.Contains(err.Error(), "not found") {
return err
}
}
cronWorkflow, err := c.selectCronWorkflowWithWorkflowTemplateVersion(namespace, uid)
if err != nil {
return err
}
_, err = sb.Delete("cron_workflows").
//workflow executions
var workflows []*WorkflowExecution
query, args, err := sb.Select().
Columns(getWorkflowExecutionColumns("we", "")...).
From("workflow_executions we").
Where(sq.Eq{
"cron_workflow_id": cronWorkflow.ID,
}).ToSql()
if err != nil {
return err
}
if err := c.DB.Select(&workflows, query, args...); err != nil {
return err
}
for _, wf := range workflows {
err = c.ArchiveWorkflowExecution(namespace, wf.UID)
if err != nil {
log.WithFields(log.Fields{
"Namespace": namespace,
"UID": uid,
"Error": err.Error(),
}).Error("Archive Workflow Execution Failed.")
return err
}
}
_, err = sb.Update("cron_workflows").
Set("is_archived", true).
Where(sq.Eq{
"uid": uid,
"namespace": namespace,
@@ -629,3 +661,27 @@ func (c *Client) GetCronWorkflowStatisticsForTemplates(workflowTemplates ...*Wor
return
}
func (c *Client) selectCronWorkflowWithWorkflowTemplateVersion(namespace, uid string, extraColumns ...string) (*CronWorkflow, error) {
query, args, err := sb.Select(getCronWorkflowColumns(extraColumns...)...).
From("cron_workflows cw").
Join("workflow_template_versions wtv ON wtv.id = cw.workflow_template_version_id").
Join("workflow_templates wt ON wt.id = wtv.workflow_template_id").
Where(sq.Eq{
"wt.namespace": namespace,
"cw.name": uid,
"cw.is_archived": false,
}).
ToSql()
if err != nil {
return nil, err
}
cronWorkflow := &CronWorkflow{}
if err = c.DB.Get(cronWorkflow, query, args...); err != nil {
return nil, err
}
return cronWorkflow, nil
}