Cherry-pick pingcap#1036

aylei · Oct 22, 2019 · 3692224 · 3692224
1 parent aa1b022
commit 3692224
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/tests/actions.go b/tests/actions.go
@@ -2811,7 +2811,7 @@ func (oa *operatorActions) CheckManualPauseTiDBOrDie(info *TidbClusterConfig) {
 
 func (oa *operatorActions) CheckUpgradeComplete(info *TidbClusterConfig) error {
 	ns, tcName := info.Namespace, info.ClusterName
-	if err := wait.PollImmediate(15*time.Second, DefaultPollTimeout, func() (done bool, err error) {
+	if err := wait.PollImmediate(15*time.Second, 30*time.Minute, func() (done bool, err error) {
 		tc, err := oa.cli.PingcapV1alpha1().TidbClusters(ns).Get(tcName, metav1.GetOptions{})
 		if err != nil {
 			glog.Errorf("checkUpgradeComplete, [%s/%s] cannot get tidbcluster, %v", ns, tcName, err)

diff --git a/tests/cmd/stability/main.go b/tests/cmd/stability/main.go
@@ -177,8 +177,6 @@ func run() {
 
 		// configuration change
 		for _, cluster := range clusters {
-			cluster.EnableConfigMapRollout = true
-
 			// bad conf
 			cluster.TiDBPreStartScript = strconv.Quote("exit 1")
 			cluster.TiKVPreStartScript = strconv.Quote("exit 1")
@@ -400,8 +398,9 @@ func newTidbClusterConfig(ns, clusterName string) *tests.TidbClusterConfig {
 			"binlog.drainer.workerCount": "1024",
 			"binlog.drainer.txnBatch":    "512",
 		},
-		Monitor:          true,
-		BlockWriteConfig: cfg.BlockWriter,
-		TopologyKey:      topologyKey,
+		Monitor:                true,
+		BlockWriteConfig:       cfg.BlockWriter,
+		TopologyKey:            topologyKey,
+		EnableConfigMapRollout: true,
 	}
 }