From f75087236962655187eb7b6916368c9fcff3966b Mon Sep 17 00:00:00 2001 From: shuijing198799 Date: Mon, 27 May 2019 16:31:56 +0800 Subject: [PATCH] reduce wait time and fix stablity test --- tests/actions.go | 2 +- tests/cmd/stability/main.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/actions.go b/tests/actions.go index cd0d90f49b..e9961f83b1 100644 --- a/tests/actions.go +++ b/tests/actions.go @@ -1087,7 +1087,7 @@ func (oa *operatorActions) tidbMembersReadyFn(tc *v1alpha1.TidbCluster) (bool, e if upgradePaused() { - time.Sleep(5 * time.Minute) + time.Sleep(30 * time.Second) if !pauseCorrect(tidbSet) { return false, fmt.Errorf("pause partition is not correct in upgrade phase [%s/%s] partition %d annotation %d", diff --git a/tests/cmd/stability/main.go b/tests/cmd/stability/main.go index aee2c4fc67..22c2aaeea0 100644 --- a/tests/cmd/stability/main.go +++ b/tests/cmd/stability/main.go @@ -214,6 +214,9 @@ func main() { oa.CheckTidbClusterStatusOrDie(cluster1) oa.CheckTidbClusterStatusOrDie(cluster2) + // after upgrade cluster, clean webhook + oa.CleanWebHookAndService(operatorCfg) + // cluster1: bad configuration change case cluster1.TiDBPreStartScript = strconv.Quote("exit 1") oa.UpgradeTidbClusterOrDie(cluster1) @@ -242,9 +245,6 @@ func main() { oa.UpgradeTidbClusterOrDie(cluster2) oa.CheckTidbClusterStatusOrDie(cluster2) - // after upgrade cluster, clean webhook - oa.CleanWebHookAndService(operatorCfg) - // deploy and check cluster restore oa.DeployTidbClusterOrDie(clusterRestoreTo) oa.CheckTidbClusterStatusOrDie(clusterRestoreTo)