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

p2p/simulations: fix data race on swarm/network/simulations #18464

Merged
merged 3 commits into from
Jan 22, 2019
Merged

p2p/simulations: fix data race on swarm/network/simulations #18464

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b916f8
swarm/network: fix data race on TestService bucket caused by copying …
acud Jan 16, 2019
f1a2427
p2p/simulations: changed NewEvent function to be used under network l…
acud Jan 18, 2019
8ec258a
p2p/simulations: address data race pr comments
acud Jan 18, 2019
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
19 changes: 15 additions & 4 deletions p2p/simulations/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,24 +168,28 @@ func (net *Network) Start(id enode.ID) error {
// snapshots
func (net *Network) startWithSnapshots(id enode.ID, snapshots map[string][]byte) error {
net.lock.Lock()
defer net.lock.Unlock()

node := net.getNode(id)
if node == nil {
frncmx marked this conversation as resolved.
Show resolved Hide resolved
net.lock.Unlock()
return fmt.Errorf("node %v does not exist", id)
}
if node.Up {
net.lock.Unlock()
return fmt.Errorf("node %v already up", id)
}
log.Trace("Starting node", "id", id, "adapter", net.nodeAdapter.Name())
if err := node.Start(snapshots); err != nil {
net.lock.Unlock()
log.Warn("Node startup failed", "id", id, "err", err)
return err
}
node.Up = true
log.Info("Started node", "id", id)
ev := NewEvent(node)
net.lock.Unlock()

net.events.Send(NewEvent(node))
net.events.Send(ev)

// subscribe to peer events
client, err := node.Client()
Expand All @@ -210,12 +214,14 @@ func (net *Network) watchPeerEvents(id enode.ID, events chan *p2p.PeerEvent, sub
// assume the node is now down
net.lock.Lock()
defer net.lock.Unlock()

node := net.getNode(id)
if node == nil {
frncmx marked this conversation as resolved.
Show resolved Hide resolved
return
}
node.Up = false
net.events.Send(NewEvent(node))
ev := NewEvent(node)
net.events.Send(ev)
}()
for {
select {
Expand Down Expand Up @@ -254,9 +260,11 @@ func (net *Network) Stop(id enode.ID) error {
net.lock.Lock()
node := net.getNode(id)
if node == nil {
net.lock.Unlock()
return fmt.Errorf("node %v does not exist", id)
}
if !node.Up {
net.lock.Unlock()
return fmt.Errorf("node %v already down", id)
}
node.Up = false
Expand All @@ -270,7 +278,10 @@ func (net *Network) Stop(id enode.ID) error {
return err
}
log.Info("Stopped node", "id", id, "err", err)
net.events.Send(ControlEvent(node))
net.lock.Lock()
ev := ControlEvent(node)
net.lock.Unlock()
net.events.Send(ev)
return nil
}

Expand Down