Increase waiting for db start for testing

Author: svaroqui

cluster/cluster_tst.go

@@ -352,7 +352,7 @@ func (cluster *Cluster) InitTestCluster(conf string, test *Test) bool {
 	savedFailoverCtr = cluster.FailoverCtr
 	savedFailoverTs = cluster.FailoverTs
 	cluster.CleanAll = true
-	if cluster.testStopCluster {
+	if !cluster.IsProvision {
 		err := cluster.Bootstrap()
 		if err != nil {
 			cluster.LogPrintf(LvlErr, "Abording test, bootstrap failed, %s", err)

cluster/cluster_wait.go

@@ -206,7 +206,7 @@ func (cluster *Cluster) WaitDatabaseStart(server *ServerMonitor) error {
 	if exitloop == 9999999 {
 		cluster.LogPrintf(LvlInfo, "Waiting state running reach on %s", server.URL)
 	} else {
-		cluster.LogPrintf("Wait state running on %s", server.URL)
+		cluster.LogPrintf(LvlErr, "Wait state running on %s", server.URL)
 		return errors.New("Failed to wait running database server")
 	}
 	return nil

cluster/prov.go

@@ -34,7 +34,7 @@ func (cluster *Cluster) Bootstrap() error {
 		return err
 	}
 	if cluster.Conf.Test {
-		cluster.initProxies()
+		//cluster.initProxies()
 		err = cluster.WaitProxyEqualMaster()
 		if err != nil {
 			return err

etc/opensvc/cluster-api/cluster-demo/stephane.toml

@@ -48,24 +48,28 @@ prov-db-disk-size = "2"
 prov-db-memory = "256"
 prov-db-disk-iops = "10000"
 prov-db-cpu-cores = "8"
+prov-proxy-disk-size = "1"
+
 monitoring-scheduler = false
+sysbench-binary-path ="/usr/local/bin/sysbench"
+sysbench-v1 = true
+
 # backup-restic = true
 
-proxysql=true
-proxysql-port = 3306
-proxysql-servers = "proxysql1,proxysql2"
-proxysql-user ="external"
-proxysql-bootstrap= true
-proxysql-copy-grants = true
-prov-proxy-disk-size = "1"
+#proxysql=true
+#proxysql-port = 3306
+#proxysql-servers = "proxysql1,proxysql2"
+#proxysql-user ="external"
+#proxysql-bootstrap= true
+#proxysql-copy-grants = true
+
 
 #maxscale=true
 #maxscale-servers = "maxscale1"
 
 haproxy=true
 haproxy-servers = "haproxy1"
-sysbench-binary-path ="/usr/local/bin/sysbench"
-sysbench-v1 = true
-shardproxy=true
-shardproxy-servers = "shardproxy1"
-prov-proxy-docker-shardproxy-img="signal18/mariadb-spider:latest"
+
+#shardproxy=true
+#shardproxy-servers = "shardproxy1"
+#prov-proxy-docker-shardproxy-img="signal18/mariadb-spider:latest"

main.go

@@ -175,7 +175,7 @@ func init() {
 	monitorCmd.Flags().BoolVar(&conf.MonitorProcessList, "monitoring-processlist", true, "Enable capture 50 longuest process via processlist")
 	monitorCmd.Flags().StringVar(&conf.MonitorAddress, "monitoring-address", "localhost", "How to contact this monitoring")
 	monitorCmd.Flags().StringVar(&conf.MonitorTenant, "monitoring-tenant", "default", "Can be use to store multi tenant identifier")
-	monitorCmd.Flags().Int64Var(&conf.MonitorWaitRetry, "monitoring-wait-retry", 30, "Retry this number of time before giving up state transition <999999")
+	monitorCmd.Flags().Int64Var(&conf.MonitorWaitRetry, "monitoring-wait-retry", 60, "Retry this number of time before giving up state transition <999999")
 	monitorCmd.Flags().BoolVar(&conf.LogSST, "log-sst", false, "Log open and close SST transfert")
 	monitorCmd.Flags().BoolVar(&conf.LogHeartbeat, "log-heartbeat", false, "Log Heartbeat")
 	monitorCmd.Flags().BoolVar(&conf.LogFailedElection, "log-failed-election", false, "Log failed election")