From b5a2aa73e21b27408872be94e6f2cc5c29ff117f Mon Sep 17 00:00:00 2001 From: xiaojingchen Date: Mon, 15 Apr 2019 17:52:54 +0800 Subject: [PATCH 1/2] remove monitor config job --- tests/actions.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/actions.go b/tests/actions.go index 35d6d521815..301663a12cb 100644 --- a/tests/actions.go +++ b/tests/actions.go @@ -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 From 9ff2498f8761020095010954814dadb63867b80d Mon Sep 17 00:00:00 2001 From: xiaojingchen Date: Mon, 15 Apr 2019 18:10:50 +0800 Subject: [PATCH 2/2] fix fmt bug --- tests/fault.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fault.go b/tests/fault.go index 0f97efdf26d..d1b2862507c 100644 --- a/tests/fault.go +++ b/tests/fault.go @@ -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) } }