Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(share/discovery): add loop to read events from the channel multiple times #1684

Merged
merged 2 commits into from
Feb 2, 2023
Merged

fix(share/discovery): add loop to read events from the channel multiple times #1684

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf2b03c
fix(share/discovery): add loop to read events from the channel
vgonkivs Feb 2, 2023
70da65f
Merge branch 'main' into fix_handling_subscription_in_disovery
vgonkivs Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nodebuilder/tests/p2p_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ func TestRestartNodeDiscovery(t *testing.T) {
select {
case <-ctx.Done():
require.True(t, nodes[0].Host.Network().Connectedness(node.Host.ID()) == network.Connected)
return
case conn := <-connectSub.Out():
status := conn.(event.EvtPeerConnectednessChanged)
if status.Peer != node.Host.ID() {
Expand Down
42 changes: 22 additions & 20 deletions share/availability/discovery/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,27 +143,29 @@ func (d *Discovery) ensurePeers(ctx context.Context) {
// starting to listen to subscriptions async will help us to avoid any blocking
// in the case when we will not have the needed amount of FNs and will be blocked in `FindPeers`.
go func() {
select {
case <-ctx.Done():
log.Debug("Context canceled. Finish listening for connectedness events.")
return
case e, ok := <-sub.Out():
if !ok {
log.Debug("Subscription for connectedness events is closed.")
for {
select {
case <-ctx.Done():
log.Debug("Context canceled. Finish listening for connectedness events.")
return
}
// listen to disconnect event to remove peer from set and reset backoff time
// reset timer in order to restart the discovery, once stored peer is disconnected
connStatus := e.(event.EvtPeerConnectednessChanged)
if connStatus.Connectedness == network.NotConnected {
if d.set.Contains(connStatus.Peer) {
log.Debugw("removing the peer from the peer set",
"peer", connStatus.Peer, "status", connStatus.Connectedness.String())
d.connector.RestartBackoff(connStatus.Peer)
d.set.Remove(connStatus.Peer)
d.onUpdatedPeers(connStatus.Peer, false)
d.host.ConnManager().UntagPeer(connStatus.Peer, topic)
t.Reset(d.discoveryInterval)
case e, ok := <-sub.Out():
if !ok {
log.Debug("Subscription for connectedness events is closed.")
return
}
// listen to disconnect event to remove peer from set and reset backoff time
// reset timer in order to restart the discovery, once stored peer is disconnected
connStatus := e.(event.EvtPeerConnectednessChanged)
if connStatus.Connectedness == network.NotConnected {
if d.set.Contains(connStatus.Peer) {
log.Debugw("removing the peer from the peer set",
"peer", connStatus.Peer, "status", connStatus.Connectedness.String())
d.connector.RestartBackoff(connStatus.Peer)
d.set.Remove(connStatus.Peer)
d.onUpdatedPeers(connStatus.Peer, false)
d.host.ConnManager().UntagPeer(connStatus.Peer, topic)
t.Reset(d.discoveryInterval)
}
}
}
}
Expand Down