Skip to content

Commit

Permalink
remove monitor config job check (#390)
Browse files Browse the repository at this point in the history
* remove monitor config job

* fix fmt bug
  • Loading branch information
xiaojingchen authored Apr 15, 2019
1 parent ecdf6df commit 721531e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
11 changes: 0 additions & 11 deletions tests/actions.go
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
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

0 comments on commit 721531e

Please sign in to comment.