Removed slave can cause the server to crash with error 1045

Add pprof to http handler

Author: svaroqui

cluster/srv.go

@@ -93,6 +93,7 @@ type ServerMonitor struct {
 	IsMaintenance               bool
 	Ignored                     bool
 	Prefered                    bool
+	BinlogDumpThreads           int
 	MxsVersion                  int
 	MxsHaveGtid                 bool
 	RelayLogSize                uint64
@@ -226,7 +227,7 @@ func (server *ServerMonitor) Ping(wg *sync.WaitGroup) {
 		if driverErr, ok := err.(*mysql.MySQLError); ok {
 			// access denied
 			if driverErr.Number == 1045 {
-				server.State = stateUnconn
+				//server.State = stateUnconn
 				server.ClusterGroup.SetState("ERR00004", state.State{ErrType: "ERROR", ErrDesc: fmt.Sprintf(clusterError["ERR00004"], server.URL, err.Error()), ErrFrom: "TOPO"})
 			}
 		}
@@ -477,6 +478,12 @@ func (server *ServerMonitor) Refresh() error {
 
 	// SHOW MASTER STATUS
 	server.MasterStatus, err = dbhelper.GetMasterStatus(server.Conn)
+
+	err = server.Conn.Get(&server.BinlogDumpThreads, "SELECT COUNT(*) AS n FROM INFORMATION_SCHEMA.PROCESSLIST WHERE command LIKE 'binlog dump%'")
+	if err != nil {
+		server.ClusterGroup.SetState("ERR00014", state.State{ErrType: "ERROR", ErrDesc: fmt.Sprintf(clusterError["ERR00014"], server.URL, err), ErrFrom: "CONF"})
+	}
+
 	if err != nil {
 		// binary log might be closed for that server
 	} else {

cluster/topology.go

@@ -143,13 +143,8 @@ func (cluster *Cluster) TopologyDiscover() error {
 			}
 			cluster.slaves = append(cluster.slaves, sv)
 		} else {
-			var n int
-			err := sv.Conn.Get(&n, "SELECT COUNT(*) AS n FROM INFORMATION_SCHEMA.PROCESSLIST WHERE command LIKE 'binlog dump%'")
-			if err != nil {
-				cluster.SetState("ERR00014", state.State{ErrType: "ERROR", ErrDesc: fmt.Sprintf(clusterError["ERR00014"], sv.URL, err), ErrFrom: "CONF"})
-				continue
-			}
-			if n == 0 && sv.State != stateMaster {
+
+			if sv.BinlogDumpThreads == 0 && sv.State != stateMaster {
 				sv.State = stateUnconn
 				// TODO: fix flapping in case slaves are reconnecting
 				if cluster.conf.LogLevel > 2 {
@@ -164,6 +159,7 @@ func (cluster *Cluster) TopologyDiscover() error {
 				cluster.master.SetReadWrite()
 			}
 		}
+		//		cluster.LogPrintf(LvlInfo, "Server %s was in state %s ", sv.URL, sv.State)
 		sv.CheckPrivileges()
 	}
 

httpserver.go

@@ -141,7 +141,7 @@ func httpserver() {
 	// main page
 
 	// page to view which does not need authorization
-
+	router.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux)
 	router.HandleFunc("/servers", handlerServers)
 	router.HandleFunc("/stop", handlerStopServer)
 	router.HandleFunc("/start", handlerStartServer)