optimisation: don't re-assign our ShortID if nothing got gc'ed

weaveworks · Dec 30, 2015 · 58de14f · 58de14f
1 parent 0ecc0ee
commit 58de14f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mesh/peers.go b/mesh/peers.go
@@ -395,7 +395,7 @@ func (peers *Peers) garbageCollect(pending *PeersPendingNotifications) {
 		}
 	}
 
-	if peers.byShortID[peers.ourself.ShortID].peer != peers.ourself.Peer {
+	if len(pending.removed) > 0 && peers.byShortID[peers.ourself.ShortID].peer != peers.ourself.Peer {
 		// The local peer doesn't own its short id.  Garbage
 		// collection might have freed some up, so try to
 		// reassign.