backport of svar arbitrator fixes

Propagate runStatus to cluster after peer negotiation
Rejoin code can be reached by a standby replication-manager

Author: tanji

arbitrator.go

@@ -15,9 +15,9 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/spf13/cobra"
 	"github.com/signal18/replication-manager/cluster"
 	"github.com/signal18/replication-manager/dbhelper"
+	"github.com/spf13/cobra"
 )
 
 type route struct {
@@ -294,6 +294,10 @@ func fHeartbeat() {
 				currentCluster.LogPrintf("DEBUG", "Peer node is Active, I am Standby")
 				runStatus = "S"
 			}
+			// propagate all runStatus to clusters after peer negotiation
+			for _, cl := range clusters {
+				cl.SetActiveStatus(runStatus)
+			}
 		}
 
 	}

cluster/monitor.go

@@ -290,7 +290,7 @@ func (server *ServerMonitor) check(wg *sync.WaitGroup) {
 			}
 			server.State = stateUnconn
 			server.FailCount = 0
-			if server.ClusterGroup.conf.Autorejoin {
+			if server.ClusterGroup.conf.Autorejoin && server.ClusterGroup.IsActive() {
 				server.RejoinMaster()
 			} else {
 				server.ClusterGroup.LogPrintf("INFO", "Auto Rejoin is disabled")
@@ -307,7 +307,7 @@ func (server *ServerMonitor) check(wg *sync.WaitGroup) {
 			server.PrevState = server.State
 		}
 		return
-	} else if errss == nil && (server.PrevState == stateFailed || server.PrevState == stateSuspect) {
+	} else if server.ClusterGroup.IsActive() && errss == nil && (server.PrevState == stateFailed || server.PrevState == stateSuspect) {
 		server.rejoinSlave(ss)
 	}