fix: fagongzi#86

ythtwang · Jul 18, 2018 · 04af785 · 04af785
1 parent d8e9bcc
commit 04af785
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/proxy/checker.go b/pkg/proxy/checker.go
@@ -38,7 +38,13 @@ func (r *dispatcher) addToCheck(svr *serverRuntime) {
 }
 
 func (r *dispatcher) heathCheckTimeout(arg interface{}) {
-	r.checkerC <- arg.(uint64)
+	id := arg.(uint64)
+	r.RLock()
+	_, ok := r.servers[id]
+	r.RUnlock()
+	if ok {
+		r.checkerC <- id
+	}
 }
 
 func (r *dispatcher) check(id uint64) {

diff --git a/pkg/proxy/dispatcher_meta.go b/pkg/proxy/dispatcher_meta.go
@@ -467,6 +467,7 @@ func (r *dispatcher) removeServer(id uint64) error {
 		return errServerNotFound
 	}
 
+	svr.heathTimeout.Stop()
 	delete(r.servers, id)
 	for _, cluster := range r.clusters {
 		cluster.remove(id)