1. MotanCluster on refresh add: shuffle endpoints list avoid to call to determine server nodes when the list is not change. 2.MotanEndpoint ensure trigger keepalive in recordErrAndKeepalive. (#243)

* add request x-forwarded-for (#241)

* 1. MotanCluster on refresh add: shuffle endpoints list avoid to call to determine server nodes when the list is not change.
2.MotanEndpoint  ensure trigger keepalive and optimise to call keepalive in recordErrAndKeepalive.

* 1. MotanCluster on refresh add: shuffle endpoints list avoid to call to determine server nodes when the list is not change.
2.MotanEndpoint  ensure trigger keepalive in recordErrAndKeepalive.

Author: snail007

cluster/motanCluster.go

@@ -122,9 +122,16 @@ func (m *MotanCluster) refresh() {
 			newRefers = append(newRefers, e)
 		}
 	}
+	// shuffle endpoints list avoid to call to determine server nodes when the list is not change.
+	newRefers = m.ShuffleEndpoints(newRefers)
 	m.Refers = newRefers
 	m.LoadBalance.OnRefresh(newRefers)
 }
+func (m *MotanCluster) ShuffleEndpoints(endpoints []motan.EndPoint) []motan.EndPoint {
+	rand.Seed(time.Now().UnixNano())
+	rand.Shuffle(len(endpoints), func(i, j int) { endpoints[i], endpoints[j] = endpoints[j], endpoints[i] })
+	return endpoints
+}
 func (m *MotanCluster) AddRegistry(registry motan.Registry) {
 	m.Registries = append(m.Registries, registry)
 }

endpoint/motanEndpoint.go

@@ -219,7 +219,8 @@ func (m *MotanEndpoint) Call(request motan.Request) motan.Response {
 
 func (m *MotanEndpoint) recordErrAndKeepalive() {
 	errCount := atomic.AddUint32(&m.errorCount, 1)
-	if errCount == uint32(m.errorCountThreshold) {
+	// ensure trigger keepalive
+	if errCount >= uint32(m.errorCountThreshold) {
 		m.setAvailable(false)
 		vlog.Infoln("Referer disable:" + m.url.GetIdentity())
 		go m.keepalive()