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 monitor config job check #390

Merged
merged 2 commits into from
Apr 15, 2019
Merged

remove monitor config job check #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5a2aa7
remove monitor config job
xiaojingchen Apr 15, 2019
9ff2498
fix fmt bug
xiaojingchen Apr 15, 2019
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
11 changes: 0 additions & 11 deletions tests/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,17 +1224,6 @@ func (oa *operatorActions) monitorNormal(clusterInfo *TidbClusterConfig) (bool,
glog.Infof("monitor ready replicas %d < 1", monitorDeployment.Status.ReadyReplicas)
return false, nil
}
configuratorJobName := fmt.Sprintf("%s-monitor-configurator", tcName)
monitorJob, err := oa.kubeCli.BatchV1().Jobs(ns).Get(configuratorJobName, metav1.GetOptions{})
if err != nil {
glog.Infof("get monitor configurator job: [%s/%s] failed", ns, configuratorJobName)
return false, nil
}
if monitorJob.Status.Succeeded == 0 {
glog.Infof("the monitor configurator job: [%s/%s] had not success", ns, configuratorJobName)
return false, nil
}

if err := oa.checkPrometheus(clusterInfo); err != nil {
glog.Infof("check [%s/%s]'s prometheus data failed: %v", ns, monitorDeploymentName, err)
return false, nil
Expand Down
2 changes: 1 addition & 1 deletion tests/fault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (fa *faultTriggerActions) CheckAndRecoverEnv() error {
}

func (fa *faultTriggerActions) CheckAndRecoverEnvOrDie() {
if err:=fa.CheckAndRecoverEnv();err!=nil{
if err := fa.CheckAndRecoverEnv(); err != nil {
glog.Fatal(err)
}
}
Expand Down