logos-messaging/go-libp2p-pubsub
1
0
Fork 0
mirror of https://github.com/logos-messaging/go-libp2p-pubsub.git synced 2026-01-04 22:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the global variable mutation races

Browse Source
This commit is contained in:
vyzo 2020-04-22 20:46:35 +03:00
parent a2f6f7b5b5
commit 11ef2a9cf2
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gossipsub.go
View File

@ -107,6 +107,9 @@ func NewGossipSub(ctx context.Context, h host.Host, opts ...Option) (*PubSub, er
iasked: make(map[peer.ID]int),
connect: make(chan connectInfo, GossipSubMaxPendingConnections),
mcache: NewMessageCache(GossipSubHistoryGossip, GossipSubHistoryLength),
// these must be pulled in to resolve races in tests... sigh.
directConnectTicks: GossipSubDirectConnectTicks,
opportunisticGraftTicks: GossipSubOpportunisticGraftTicks,
}
return NewPubSub(ctx, h, rt, opts...)
}
@ -258,6 +261,10 @@ type GossipSubRouter struct {
// number of heartbeats since the beginning of time; this allows us to amortize some resource
// clean up -- eg backoff clean up.
heartbeatTicks uint64
// tick "constants" for triggering direct connect and opportunistic grafting
// these are pulled from their global value or else the race detector is angry on travis
directConnectTicks, opportunisticGraftTicks uint64
}
type connectInfo struct {
@ -1001,7 +1008,7 @@ func (gs *GossipSubRouter) heartbeat() {
}
// should we try to improve the mesh with opportunistic grafting?
if gs.heartbeatTicks%GossipSubOpportunisticGraftTicks == 0 && len(peers) > 1 {
if gs.heartbeatTicks%gs.opportunisticGraftTicks == 0 && len(peers) > 1 {
// Opportunistic grafting works as follows: we check the median score of peers in the
// mesh; if this score is below the opportunisticGraftThreshold, we select a few peers at
// random with score over the median.
@ -1131,7 +1138,7 @@ func (gs *GossipSubRouter) clearBackoff() {
func (gs *GossipSubRouter) directConnect() {
// we donly do this every some ticks to allow pending connections to complete and account
// for restarts/downtime
if gs.heartbeatTicks%GossipSubDirectConnectTicks != 0 {
if gs.heartbeatTicks%gs.directConnectTicks != 0 {
return
}

1
gossipsub_spam_test.go
View File

@ -321,7 +321,6 @@ func TestGossipsubAttackGRAFTDuringBackoff(t *testing.T) {
originalGossipSubPruneBackoffPenalty := GossipSubPruneBackoffPenalty
GossipSubPruneBackoffPenalty = 500 * time.Millisecond
defer func() {
time.Sleep(time.Second + 100*time.Millisecond)
GossipSubPruneBackoff = originalGossipSubPruneBackoff
GossipSubPruneBackoffPenalty = originalGossipSubPruneBackoffPenalty
GossipSubGraftFloodThreshold = originalGossipSubGraftFloodThreshold

3
gossipsub_test.go
View File

@ -272,7 +272,6 @@ func TestGossipsubFanoutMaintenance(t *testing.T) {
func TestGossipsubFanoutExpiry(t *testing.T) {
GossipSubFanoutTTL = 1 * time.Second
defer func() {
time.Sleep(time.Second + 100*time.Millisecond)
GossipSubFanoutTTL = 60 * time.Second
}()
@ -1000,7 +999,6 @@ func TestGossipsubDirectPeers(t *testing.T) {
originalGossipSubDirectConnectTicks := GossipSubDirectConnectTicks
GossipSubDirectConnectTicks = 2
defer func() {
time.Sleep(time.Second + 100*time.Millisecond)
GossipSubDirectConnectTicks = originalGossipSubDirectConnectTicks
}()
@ -1286,7 +1284,6 @@ func TestGossipsubOpportunisticGrafting(t *testing.T) {
originalGossipSubOpportunisticGraftTicks := GossipSubOpportunisticGraftTicks
GossipSubOpportunisticGraftTicks = 2
defer func() {
time.Sleep(time.Second + 100*time.Millisecond)
GossipSubPruneBackoff = originalGossipSubPruneBackoff
GossipSubGraftFloodThreshold = originalGossipSubGraftFloodThreshold
GossipSubOpportunisticGraftTicks = originalGossipSubOpportunisticGraftTicks