status-im/nim-libp2p
2
0
Fork 0
mirror of https://github.com/status-im/nim-libp2p.git synced 2025-02-28 12:30:46 +00:00
Code Issues Projects Releases Wiki Activity

add more heartbeat locking to prevent races

Browse Source
This commit is contained in:
Giovanni Petrantoni 2020-07-04 14:04:44 +09:00
parent 0d0309a601
commit ad7db1ca26
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libp2p/protocols/pubsub/gossipsub.nim
View File

@ -220,31 +220,33 @@ method handleDisconnect*(g: GossipSub, peer: PubSubPeer) {.async.} =
## handle peer disconnects ## handle peer disconnects
trace "peer disconnected", peer=peer.id trace "peer disconnected", peer=peer.id
await procCall FloodSub(g).handleDisconnect(peer) # must avoid running this while manipulating mesh/gossip tables
await g.heartbeatLock.acquire()
try:
await procCall FloodSub(g).handleDisconnect(peer)
for t in toSeq(g.gossipsub.keys): for t in toSeq(g.gossipsub.keys):
if t in g.gossipsub:
g.gossipsub[t].excl(peer.id) g.gossipsub[t].excl(peer.id)
libp2p_gossipsub_peers_per_topic_gossipsub libp2p_gossipsub_peers_per_topic_gossipsub
.set(g.gossipsub.getOrDefault(t).len.int64, labelValues = [t]) .set(g.gossipsub.getOrDefault(t).len.int64, labelValues = [t])
# mostly for metrics # mostly for metrics
await procCall PubSub(g).subscribeTopic(t, false, peer.id) await procCall PubSub(g).subscribeTopic(t, false, peer.id)
for t in toSeq(g.mesh.keys): for t in toSeq(g.mesh.keys):
if t in g.mesh:
g.mesh[t].excl(peer.id) g.mesh[t].excl(peer.id)
libp2p_gossipsub_peers_per_topic_mesh libp2p_gossipsub_peers_per_topic_mesh
.set(g.mesh[t].len.int64, labelValues = [t]) .set(g.mesh[t].len.int64, labelValues = [t])
for t in toSeq(g.fanout.keys): for t in toSeq(g.fanout.keys):
if t in g.fanout:
g.fanout[t].excl(peer.id) g.fanout[t].excl(peer.id)
libp2p_gossipsub_peers_per_topic_fanout libp2p_gossipsub_peers_per_topic_fanout
.set(g.fanout[t].len.int64, labelValues = [t]) .set(g.fanout[t].len.int64, labelValues = [t])
finally:
g.heartbeatLock.release()
method subscribeToPeer*(p: GossipSub, method subscribeToPeer*(p: GossipSub,
conn: Connection) {.async.} = conn: Connection) {.async.} =
@ -255,28 +257,30 @@ method subscribeTopic*(g: GossipSub,
topic: string, topic: string,
subscribe: bool, subscribe: bool,
peerId: string) {.gcsafe, async.} = peerId: string) {.gcsafe, async.} =
await procCall PubSub(g).subscribeTopic(topic, subscribe, peerId)
if topic notin g.gossipsub: # must avoid running this while manipulating mesh/gossip tables
g.gossipsub[topic] = initHashSet[string]() await g.heartbeatLock.acquire()
try:
await procCall PubSub(g).subscribeTopic(topic, subscribe, peerId)
if subscribe: if topic notin g.gossipsub:
trace "adding subscription for topic", peer = peerId, name = topic g.gossipsub[topic] = initHashSet[string]()
# subscribe remote peer to the topic
g.gossipsub[topic].incl(peerId)
else:
trace "removing subscription for topic", peer = peerId, name = topic
# unsubscribe remote peer from the topic
g.gossipsub[topic].excl(peerId)
libp2p_gossipsub_peers_per_topic_gossipsub if subscribe:
.set(g.gossipsub[topic].len.int64, labelValues = [topic]) trace "adding subscription for topic", peer = peerId, name = topic
# subscribe remote peer to the topic
g.gossipsub[topic].incl(peerId)
else:
trace "removing subscription for topic", peer = peerId, name = topic
# unsubscribe remote peer from the topic
g.gossipsub[topic].excl(peerId)
trace "gossip peers", peers = g.gossipsub[topic].len, topic libp2p_gossipsub_peers_per_topic_gossipsub
.set(g.gossipsub[topic].len.int64, labelValues = [topic])
# also rebalance current topic if we are subbed to trace "gossip peers", peers = g.gossipsub[topic].len, topic
if topic in g.topics: finally:
await g.rebalanceMesh(topic) g.heartbeatLock.release()
proc handleGraft(g: GossipSub, proc handleGraft(g: GossipSub,
peer: PubSubPeer, peer: PubSubPeer,

2
libp2p/protocols/pubsub/pubsub.nim
View File

@ -100,7 +100,7 @@ method rpcHandler*(p: PubSub,
method handleDisconnect*(p: PubSub, peer: PubSubPeer) {.async, base.} = method handleDisconnect*(p: PubSub, peer: PubSubPeer) {.async, base.} =
## handle peer disconnects ## handle peer disconnects
if peer.id in p.peers: if peer.id in p.peers:
trace "deleting peer", id = peer.id trace "deleting peer", id = peer.id, trace = getStackTrace()
p.peers.del(peer.id) p.peers.del(peer.id)
# metrics # metrics