Skip to content

add check clean task interval #233

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

Open
binbin0325 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add check clean task interval #233

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
17 changes: 13 additions & 4 deletions pkg/controller/chaosblade/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,28 @@ func startPeriodicallyCleanUpBlade(mgr manager.Manager) {
cli := mgr.GetClient()
duration, err := time.ParseDuration(chaosblade.RemoveBladeInterval)
if err != nil {
logrus.Errorf("parse interval error: %v, use default interval: %s", err, chaosblade.DefaultRemoveBladeInterval)
logrus.Errorf("parse remove blade interval error: %v, use default interval: %s", err, chaosblade.DefaultRemoveBladeInterval)
duration, err = time.ParseDuration(chaosblade.DefaultRemoveBladeInterval)
chaosblade.RemoveBladeInterval = chaosblade.DefaultRemoveBladeInterval
if err != nil {
logrus.Fatalf("start periodically clean up blade, ticker error: %v", err)
logrus.Fatalf("parse remove blade interval error: %v", err)
}
}
// first clean up
periodicallyCleanUpBlade(cli, duration)

checkDuration, err := time.ParseDuration(chaosblade.CheckCleanTaskInterval)
if err != nil {
logrus.Errorf("parse clean task interval error: %v, use default interval: %s", err, chaosblade.DefaultCheckCleanTaskInterval)
checkDuration, err = time.ParseDuration(chaosblade.DefaultCheckCleanTaskInterval)
chaosblade.CheckCleanTaskInterval = chaosblade.DefaultCheckCleanTaskInterval
if err != nil {
logrus.Fatalf("start periodically clean up blade, ticker error: %v", err)
}
}
// ticker clean up
ticker := time.NewTicker(time.Second * time.Duration(duration.Seconds()))
logrus.Infof("start periodically clean up blade ticker, interval: %s", chaosblade.RemoveBladeInterval)
ticker := time.NewTicker(checkDuration)
logrus.Infof("start periodically clean up blade ticker,check interval: %s,retention interval:%s", chaosblade.CheckCleanTaskInterval, chaosblade.RemoveBladeInterval)
for range ticker.C {
periodicallyCleanUpBlade(cli, duration)
}
Expand Down
23 changes: 14 additions & 9 deletions pkg/runtime/chaosblade/chaosblade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ import (
)

var (
ImageRepository string
Version string
PullPolicy string
DaemonsetEnable bool
RemoveBladeInterval string
DownloadUrl string
ImageRepository string
Version string
PullPolicy string
DaemonsetEnable bool
RemoveBladeInterval string
CheckCleanTaskInterval string
DownloadUrl string
)

const (
Expand All @@ -39,8 +40,11 @@ const (
OperatorChaosBladeBlade = "/opt/chaosblade/blade"
)

const DaemonsetPodName = "chaosblade-tool"
const DefaultRemoveBladeInterval = "72h"
const (
DaemonsetPodName = "chaosblade-tool"
DefaultRemoveBladeInterval = "72h"
DefaultCheckCleanTaskInterval = "3s"
)

var DaemonsetPodLabels = map[string]string{
"app": "chaosblade-tool",
Expand All @@ -67,7 +71,8 @@ func init() {
f.StringVar(&ImageRepository, "chaosblade-image-repository", "chaosbladeio/chaosblade-tool", "Image repository of chaosblade tool")
f.StringVar(&PullPolicy, "chaosblade-image-pull-policy", "IfNotPresent", "Pulling policy of chaosblade image, default value is IfNotPresent.")
f.BoolVar(&DaemonsetEnable, "daemonset-enable", false, "Deploy chaosblade daemonset to resolve chaos experiment environment of network, default value is false.")
f.StringVar(&RemoveBladeInterval, "remove-blade-interval", DefaultRemoveBladeInterval, "Periodically clean up blade state is destroying, default value is 24h.")
f.StringVar(&RemoveBladeInterval, "remove-blade-interval", DefaultRemoveBladeInterval, "Periodically clean up blade state is destroying, default value is 72h.")
f.StringVar(&RemoveBladeInterval, "clean-task-interval", DefaultCheckCleanTaskInterval, "Periodically check clean up blade task, default value is 3s.")
Copy link
Member

@spencercjh spencercjh Mar 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: duplicated &RemoceBladeInterval, it should be &CheckCleanTaskInterval.

f.StringVar(&DownloadUrl, "chaosblade-download-url", "", "The chaosblade downloaded address which works when the chaosblade is deployed in download mode.")
f.StringVar(&DaemonsetPodNamespace, "chaosblade-namespace", "chaosblade", "The chaosblade deployment namespace")
}
Expand Down