remove select for timer stop and fix unit tests

weaveworks · Oct 1, 2019 · 25e492a · 25e492a
1 parent 1bb1ce4
commit 25e492a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/gossip_test.go b/gossip_test.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"sync"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -66,6 +67,8 @@ func sendPendingGossip(routers ...*Router) {
 			sentSomething = router.sendPendingGossip() || sentSomething
 		}
 	}
+	// add delay for periodic GC to get triggered after receiving topology gossip
+	time.Sleep(2 * time.Second)
 }
 
 func addTestGossipConnection(r1, r2 *Router) {

diff --git a/peers.go b/peers.go
@@ -350,22 +350,16 @@ func (peers *Peers) forEach(fun func(*Peer)) {
 }
 
 func (peers *Peers) actorLoop() {
-	stop := func() {
-		if !peers.timer.Stop() {
-			select {
-			case <-peers.timer.C:
-			default:
-			}
-		}
-	}
 	for {
 		select {
 		case <-peers.timer.C:
 			peers.GarbageCollect()
 			// stop the timer so that next scheduled GarbageCollect() will be done
 			// only on receiving topology update
-			stop()
+			peers.timer.Stop()
+			peers.Lock()
 			peers.pendingGC = false
+			peers.Unlock()
 		}
 	}
 }