Merge pull request #571 from ahfa92/proxysql-issue

Set Writer From Reader List when Master as Reader is enabled

Author: svaroqui

cluster/prx_proxysql.go

@@ -231,7 +231,7 @@ func (proxy *ProxySQLProxy) Failover() {
 			}
 		}
 		if s.IsMaster() && !s.IsRelay && cluster.oldMaster != nil {
-			err = psql.ReplaceWriter(misc.Unbracket(s.Host), s.Port, misc.Unbracket(cluster.oldMaster.Host), cluster.oldMaster.Port, cluster.Configurator.HasProxyReadLeader(), proxy.UseSSL())
+			err = psql.ReplaceWriter(misc.Unbracket(s.Host), s.Port, misc.Unbracket(cluster.oldMaster.Host), cluster.oldMaster.Port, cluster.Configurator.HasProxyReadLeader())
 			if err != nil {
 				cluster.LogModulePrintf(cluster.Conf.Verbose, config.ConstLogModProxySQL, LvlErr, "Failover ProxySQL could not set server %s Master (%s)", s.URL, err)
 			} else {
@@ -407,7 +407,7 @@ func (proxy *ProxySQLProxy) Refresh() error {
 			} else if s.IsSlaveOrSync() && !s.IsIgnored() && (s.PrevState == stateUnconn || s.PrevState == stateFailed) {
 				err = psql.SetReader(misc.Unbracket(s.Host), s.Port)
 				if cluster.Conf.ProxysqlDebug {
-					cluster.LogModulePrintf(cluster.Conf.Verbose, config.ConstLogModProxySQL, LvlInfo, "Monitor ProxySQL setting reader standalone server %s", s.URL)
+					cluster.LogModulePrintf(cluster.Conf.Verbose, config.ConstLogModProxySQL, LvlDbg, "Monitor ProxySQL setting reader standalone server %s", s.URL)
 				}
 				if err != nil {
 					cluster.StateMachine.AddState("ERR00072", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["ERR00072"], proxy.Name, s.URL, err), ErrFrom: "PRX", ServerUrl: proxy.Name})

router/proxysql/proxysql.go

@@ -236,14 +236,20 @@ func (psql *ProxySQL) ReloadTLS() error {
 	return err
 }
 
-func (psql *ProxySQL) ReplaceWriter(host string, port string, oldhost string, oldport string, masterasreader bool, use_ssl string) error {
+func (psql *ProxySQL) CopyReaderToWriter(host string, port string) error {
+	sql := fmt.Sprintf("REPLACE INTO mysql_servers (hostgroup_id, hostname, port, gtid_port, status, weight, compression, max_connections, max_replication_lag, use_ssl, max_latency_ms) SELECT '%s', hostname, port, gtid_port, status, weight, compression, max_connections, max_replication_lag, use_ssl, max_latency_ms FROM mysql_servers WHERE  hostgroup_id = '%s' AND hostname = '%s' AND port = '%s'", psql.WriterHG, psql.ReaderHG, host, port)
+	_, err := psql.Connection.Exec(sql)
+	return err
+}
+
+func (psql *ProxySQL) ReplaceWriter(host string, port string, oldhost string, oldport string, masterasreader bool) error {
 
 	if masterasreader {
 		err := psql.DeleteAllWriters()
 		if err != nil {
 			return err
 		}
-		err = psql.AddServerAsWriter(host, port, use_ssl)
+		err = psql.CopyReaderToWriter(host, port)
 		return err
 	} else {
 		err := psql.SetReader(oldhost, oldport)
@@ -383,7 +389,7 @@ func (psql *ProxySQL) LoadServersToRuntime() error {
 }
 
 func (psql *ProxySQL) SaveServersToDisk() error {
-	_, err := psql.Connection.Exec("SAVE PROXYSQL SERVERS TO DISK")
+	_, err := psql.Connection.Exec("SAVE MYSQL SERVERS TO DISK")
 	return err
 }
 
@@ -416,3 +422,13 @@ func (psql *ProxySQL) Shutdown() error {
 	_, err := psql.Connection.Exec("PROXYSQL KILL")
 	return err
 }
+
+func (psql *ProxySQL) LoadProxiesToRuntime() error {
+	_, err := psql.Connection.Exec("LOAD PROXYSQL SERVERS TO RUNTIME")
+	return err
+}
+
+func (psql *ProxySQL) SaveProxiesToDisk() error {
+	_, err := psql.Connection.Exec("SAVE PROXYSQL SERVERS TO DISK")
+	return err
+}