fix some code

pingcap · Apr 30, 2019 · 852625f · 852625f
1 parent c87cbff
commit 852625f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/tests/failover.go b/tests/failover.go
@@ -477,7 +477,7 @@ func (oa *operatorActions) CheckOneApiserverDownOrDie(operatorConfig *OperatorCo
 	affectedPods := map[string]*corev1.Pod{}
 	apiserverPod, err := GetApiserverPod(oa.kubeCli, faultNode)
 	if err != nil {
-		panic(fmt.Errorf("can't find apiserver in node:%s", faultNode))
+		slack.NotifyAndPanic(fmt.Errorf("can't find apiserver in node:%s", faultNode))
 	}
 	if apiserverPod != nil {
 		affectedPods[apiserverPod.GetName()] = apiserverPod
@@ -498,7 +498,7 @@ func (oa *operatorActions) CheckOneApiserverDownOrDie(operatorConfig *OperatorCo
 	}
 	dnsPod, err := GetDnsPod(oa.kubeCli, faultNode)
 	if err != nil {
-		panic(fmt.Errorf("can't find controller-manager in node:%s", faultNode))
+		slack.NotifyAndPanic(fmt.Errorf("can't find controller-manager in node:%s", faultNode))
 	}
 	if dnsPod != nil {
 		affectedPods[dnsPod.GetName()] = dnsPod
@@ -525,7 +525,7 @@ func (oa *operatorActions) CheckOneApiserverDownOrDie(operatorConfig *OperatorCo
 
 func (oa *operatorActions) CheckK8sAvailableOrDie(excludeNodes map[string]string, excludePods map[string]*corev1.Pod) {
 	if err := oa.CheckK8sAvailable(excludeNodes, excludePods); err != nil {
-		panic(err)
+		slack.NotifyAndPanic(err)
 	}
 }
 

diff --git a/tests/fault.go b/tests/fault.go
@@ -215,7 +215,7 @@ func (fa *faultTriggerActions) StopETCD(nodes ...string) error {
 
 func (fa *faultTriggerActions) StopETCDOrDie(nodes ...string) {
 	if err := fa.StopETCD(nodes...); err != nil {
-		panic(err)
+		slack.NotifyAndPanic(err)
 	}
 }
 
@@ -239,7 +239,7 @@ func (fa *faultTriggerActions) StartETCD(nodes ...string) error {
 
 func (fa *faultTriggerActions) StartETCDOrDie(nodes ...string) {
 	if err := fa.StartETCD(nodes...); err != nil {
-		panic(err)
+		slack.NotifyAndPanic(err)
 	}
 }
 
@@ -290,7 +290,7 @@ func (fa *faultTriggerActions) StopKubeAPIServer(node string) error {
 
 func (fa *faultTriggerActions) StopKubeAPIServerOrDie(node string) {
 	if err := fa.StopKubeAPIServer(node); err != nil {
-		panic(err)
+		slack.NotifyAndPanic(err)
 	}
 }
 
@@ -301,7 +301,7 @@ func (fa *faultTriggerActions) StartKubeAPIServer(node string) error {
 
 func (fa *faultTriggerActions) StartKubeAPIServerOrDie(node string) {
 	if err := fa.StartKubeAPIServer(node); err != nil {
-		panic(err)
+		slack.NotifyAndPanic(err)
 	}
 }
 

diff --git a/tests/util.go b/tests/util.go
@@ -17,6 +17,8 @@ import (
 	"math/rand"
 	"time"
 
+	"github.com/pingcap/tidb-operator/tests/slack"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -32,7 +34,7 @@ func KeepOrDie(interval time.Duration, period time.Duration, fun func() error) {
 		}
 		err := fun()
 		if err != nil {
-			panic(err)
+			slack.NotifyAndPanic(err)
 		}
 		time.Sleep(interval)
 	}