Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove running env sleep cron after delete #3538

Merged
merged 1 commit into from
May 31, 2024
Merged

remove running env sleep cron after delete #3538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 39 additions & 8 deletions pkg/microservice/aslan/core/environment/service/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4392,20 +4392,51 @@ func UpsertEnvSleepCron(projectName, envName string, production *bool, req *EnvS

func deleteEnvSleepCron(projectName, envName string) error {
sleepName := util.GetEnvSleepCronName(projectName, envName, true)
opt := &commonrepo.CronjobDeleteOption{
ParentName: sleepName,
ParentType: setting.EnvSleepCronjob,
awakeName := util.GetEnvSleepCronName(projectName, envName, false)
sleepCron, err := commonrepo.NewCronjobColl().GetByName(sleepName, setting.EnvSleepCronjob)
if err != nil {
if err != mongo.ErrNoDocuments && err != mongo.ErrNilDocument {
return fmt.Errorf("failed to get env sleep cron job for sleep, err: %w", err)
}
}
err := commonrepo.NewCronjobColl().Delete(opt)
awakeCron, err := commonrepo.NewCronjobColl().GetByName(awakeName, setting.EnvSleepCronjob)
if err != nil {
return fmt.Errorf("failed to delete env sleep cron job %s for sleep, err: %w", sleepName, err)
if err != mongo.ErrNoDocuments && err != mongo.ErrNilDocument {
return fmt.Errorf("failed to get env sleep cron job for awake, err: %w", err)
}
}

awakeName := util.GetEnvSleepCronName(projectName, envName, false)
opt.ParentName = awakeName
idList := []string{}
if sleepCron != nil {
idList = append(idList, sleepCron.ID.Hex())
}
if awakeCron != nil {
idList = append(idList, awakeCron.ID.Hex())
}

payload := &commonservice.CronjobPayload{
Name: "delete-env-sleep-cronjob",
JobType: setting.EnvSleepCronjob,
Action: setting.TypeEnableCronjob,
DeleteList: idList,
}

pl, _ := json.Marshal(payload)
err = commonrepo.NewMsgQueueCommonColl().Create(&msg_queue.MsgQueueCommon{
Payload: string(pl),
QueueType: setting.TopicCronjob,
})
if err != nil {
log.Errorf("Failed to publish to nsq topic: %s, the error is: %v", setting.TopicCronjob, err)
return err
}

opt := &commonrepo.CronjobDeleteOption{
IDList: idList,
}
err = commonrepo.NewCronjobColl().Delete(opt)
if err != nil {
return fmt.Errorf("failed to delete env sleep cron job %s for awake, err: %w", sleepName, err)
return fmt.Errorf("failed to delete env sleep cron job %s for sleep, err: %w", sleepName, err)
}

return nil
Expand Down
49 changes: 41 additions & 8 deletions pkg/microservice/aslan/core/project/service/product.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (

"github.com/hashicorp/go-multierror"
"github.com/pkg/errors"
"go.mongodb.org/mongo-driver/mongo"
"go.uber.org/zap"
"k8s.io/apimachinery/pkg/util/sets"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -37,6 +38,7 @@ import (
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/collaboration/repository/mongodb"
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/collaboration/service"
commonmodels "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models"
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models/msg_queue"
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models/template"
commonrepo "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/mongodb"
templaterepo "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/mongodb/template"
Expand Down Expand Up @@ -1493,20 +1495,51 @@ func GetUnGroupedProjectKeys() ([]string, error) {

func deleteEnvSleepCron(projectName, envName string) error {
sleepName := util.GetEnvSleepCronName(projectName, envName, true)
opt := &commonrepo.CronjobDeleteOption{
ParentName: sleepName,
ParentType: setting.EnvSleepCronjob,
awakeName := util.GetEnvSleepCronName(projectName, envName, false)
sleepCron, err := commonrepo.NewCronjobColl().GetByName(sleepName, setting.EnvSleepCronjob)
if err != nil {
if err != mongo.ErrNoDocuments && err != mongo.ErrNilDocument {
return fmt.Errorf("failed to get env sleep cron job for sleep, err: %w", err)
}
}
err := commonrepo.NewCronjobColl().Delete(opt)
awakeCron, err := commonrepo.NewCronjobColl().GetByName(awakeName, setting.EnvSleepCronjob)
if err != nil {
return fmt.Errorf("failed to delete env sleep cron job %s for sleep, err: %w", sleepName, err)
if err != mongo.ErrNoDocuments && err != mongo.ErrNilDocument {
return fmt.Errorf("failed to get env sleep cron job for awake, err: %w", err)
}
}

awakeName := util.GetEnvSleepCronName(projectName, envName, false)
opt.ParentName = awakeName
idList := []string{}
if sleepCron != nil {
idList = append(idList, sleepCron.ID.Hex())
}
if awakeCron != nil {
idList = append(idList, awakeCron.ID.Hex())
}

payload := &commonservice.CronjobPayload{
Name: "delete-env-sleep-cronjob",
JobType: setting.EnvSleepCronjob,
Action: setting.TypeEnableCronjob,
DeleteList: idList,
}

pl, _ := json.Marshal(payload)
err = commonrepo.NewMsgQueueCommonColl().Create(&msg_queue.MsgQueueCommon{
Payload: string(pl),
QueueType: setting.TopicCronjob,
})
if err != nil {
log.Errorf("Failed to publish to nsq topic: %s, the error is: %v", setting.TopicCronjob, err)
return err
}

opt := &commonrepo.CronjobDeleteOption{
IDList: idList,
}
err = commonrepo.NewCronjobColl().Delete(opt)
if err != nil {
return fmt.Errorf("failed to delete env sleep cron job %s for awake, err: %w", sleepName, err)
return fmt.Errorf("failed to delete env sleep cron job %s for sleep, err: %w", sleepName, err)
}

return nil
Expand Down
Loading