50b872bf05
* swarm/network: DRY out repeated giga comment I not necessarily agree with the way we wait for event propagation. But I truly disagree with having duplicated giga comments. * p2p/simulations: encapsulate Node.Up field so we avoid data races The Node.Up field was accessed concurrently without "proper" locking. There was a lock on Network and that was used sometimes to access the field. Other times the locking was missed and we had a data race. For example: https://github.com/ethereum/go-ethereum/pull/18464 The case above was solved, but there were still intermittent/hard to reproduce races. So let's solve the issue permanently. resolves: ethersphere/go-ethereum#1146 * p2p/simulations: fix unmarshal of simulations.Node Making Node.Up field private in 13292ee897e345045fbfab3bda23a77589a271c1 broke TestHTTPNetwork and TestHTTPSnapshot. Because the default UnmarshalJSON does not handle unexported fields. Important: The fix is partial and not proper to my taste. But I cut scope as I think the fix may require a change to the current serialization format. New ticket: https://github.com/ethersphere/go-ethereum/issues/1177 * p2p/simulations: Add a sanity test case for Node.Config UnmarshalJSON * p2p/simulations: revert back to defer Unlock() pattern for Network It's a good patten to call `defer Unlock()` right after `Lock()` so (new) error cases won't miss to unlock. Let's get back to that pattern. The patten was abandoned in 85a79b3ad3c5863f8612d25c246bcfad339f36b7, while fixing a data race. That data race does not exist anymore, since the Node.Up field got hidden behind its own lock. * p2p/simulations: consistent naming for test providers Node.UnmarshalJSON * p2p/simulations: remove JSON annotation from private fields of Node As unexported fields are not serialized. * p2p/simulations: fix deadlock in Network.GetRandomDownNode() Problem: GetRandomDownNode() locks -> getDownNodeIDs() -> GetNodes() tries to lock -> deadlock On Network type, unexported functions must assume that `net.lock` is already acquired and should not call exported functions which might try to lock again. * p2p/simulations: ensure method conformity for Network Connect* methods were moved to p2p/simulations.Network from swarm/network/simulation. However these new methods did not follow the pattern of Network methods, i.e., all exported method locks the whole Network either for read or write. * p2p/simulations: fix deadlock during network shutdown `TestDiscoveryPersistenceSimulationSimAdapter` often got into deadlock. The execution was stuck on two locks, i.e, `Kademlia.lock` and `p2p/simulations.Network.lock`. Usually the test got stuck once in each 20 executions with high confidence. `Kademlia` was stuck in `Kademlia.EachAddr()` and `Network` in `Network.Stop()`. Solution: in `Network.Stop()` `net.lock` must be released before calling `node.Stop()` as stopping a node (somehow - I did not find the exact code path) causes `Network.InitConn()` to be called from `Kademlia.SuggestPeer()` and that blocks on `net.lock`. Related ticket: https://github.com/ethersphere/go-ethereum/issues/1223 * swarm/state: simplify if statement in DBStore.Put() * p2p/simulations: remove faulty godoc from private function The comment started with the wrong method name. The method is simple and self explanatory. Also, it's private. => Let's just remove the comment.
310 lines
8.3 KiB
Go
310 lines
8.3 KiB
Go
// Copyright 2018 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package simulation
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"io/ioutil"
|
|
"math/rand"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/ethereum/go-ethereum/p2p/enode"
|
|
"github.com/ethereum/go-ethereum/p2p/simulations"
|
|
"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
|
|
)
|
|
|
|
// NodeIDs returns NodeIDs for all nodes in the network.
|
|
func (s *Simulation) NodeIDs() (ids []enode.ID) {
|
|
nodes := s.Net.GetNodes()
|
|
ids = make([]enode.ID, len(nodes))
|
|
for i, node := range nodes {
|
|
ids[i] = node.ID()
|
|
}
|
|
return ids
|
|
}
|
|
|
|
// UpNodeIDs returns NodeIDs for nodes that are up in the network.
|
|
func (s *Simulation) UpNodeIDs() (ids []enode.ID) {
|
|
nodes := s.Net.GetNodes()
|
|
for _, node := range nodes {
|
|
if node.Up() {
|
|
ids = append(ids, node.ID())
|
|
}
|
|
}
|
|
return ids
|
|
}
|
|
|
|
// DownNodeIDs returns NodeIDs for nodes that are stopped in the network.
|
|
func (s *Simulation) DownNodeIDs() (ids []enode.ID) {
|
|
nodes := s.Net.GetNodes()
|
|
for _, node := range nodes {
|
|
if !node.Up() {
|
|
ids = append(ids, node.ID())
|
|
}
|
|
}
|
|
return ids
|
|
}
|
|
|
|
// AddNodeOption defines the option that can be passed
|
|
// to Simulation.AddNode method.
|
|
type AddNodeOption func(*adapters.NodeConfig)
|
|
|
|
// AddNodeWithMsgEvents sets the EnableMsgEvents option
|
|
// to NodeConfig.
|
|
func AddNodeWithMsgEvents(enable bool) AddNodeOption {
|
|
return func(o *adapters.NodeConfig) {
|
|
o.EnableMsgEvents = enable
|
|
}
|
|
}
|
|
|
|
// AddNodeWithService specifies a service that should be
|
|
// started on a node. This option can be repeated as variadic
|
|
// argument toe AddNode and other add node related methods.
|
|
// If AddNodeWithService is not specified, all services will be started.
|
|
func AddNodeWithService(serviceName string) AddNodeOption {
|
|
return func(o *adapters.NodeConfig) {
|
|
o.Services = append(o.Services, serviceName)
|
|
}
|
|
}
|
|
|
|
// AddNode creates a new node with random configuration,
|
|
// applies provided options to the config and adds the node to network.
|
|
// By default all services will be started on a node. If one or more
|
|
// AddNodeWithService option are provided, only specified services will be started.
|
|
func (s *Simulation) AddNode(opts ...AddNodeOption) (id enode.ID, err error) {
|
|
conf := adapters.RandomNodeConfig()
|
|
for _, o := range opts {
|
|
o(conf)
|
|
}
|
|
if len(conf.Services) == 0 {
|
|
conf.Services = s.serviceNames
|
|
}
|
|
node, err := s.Net.NewNodeWithConfig(conf)
|
|
if err != nil {
|
|
return id, err
|
|
}
|
|
return node.ID(), s.Net.Start(node.ID())
|
|
}
|
|
|
|
// AddNodes creates new nodes with random configurations,
|
|
// applies provided options to the config and adds nodes to network.
|
|
func (s *Simulation) AddNodes(count int, opts ...AddNodeOption) (ids []enode.ID, err error) {
|
|
ids = make([]enode.ID, 0, count)
|
|
for i := 0; i < count; i++ {
|
|
id, err := s.AddNode(opts...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
ids = append(ids, id)
|
|
}
|
|
return ids, nil
|
|
}
|
|
|
|
// AddNodesAndConnectFull is a helpper method that combines
|
|
// AddNodes and ConnectNodesFull. Only new nodes will be connected.
|
|
func (s *Simulation) AddNodesAndConnectFull(count int, opts ...AddNodeOption) (ids []enode.ID, err error) {
|
|
if count < 2 {
|
|
return nil, errors.New("count of nodes must be at least 2")
|
|
}
|
|
ids, err = s.AddNodes(count, opts...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
err = s.Net.ConnectNodesFull(ids)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ids, nil
|
|
}
|
|
|
|
// AddNodesAndConnectChain is a helpper method that combines
|
|
// AddNodes and ConnectNodesChain. The chain will be continued from the last
|
|
// added node, if there is one in simulation using ConnectToLastNode method.
|
|
func (s *Simulation) AddNodesAndConnectChain(count int, opts ...AddNodeOption) (ids []enode.ID, err error) {
|
|
if count < 2 {
|
|
return nil, errors.New("count of nodes must be at least 2")
|
|
}
|
|
id, err := s.AddNode(opts...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
err = s.Net.ConnectToLastNode(id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
ids, err = s.AddNodes(count-1, opts...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
ids = append([]enode.ID{id}, ids...)
|
|
err = s.Net.ConnectNodesChain(ids)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ids, nil
|
|
}
|
|
|
|
// AddNodesAndConnectRing is a helpper method that combines
|
|
// AddNodes and ConnectNodesRing.
|
|
func (s *Simulation) AddNodesAndConnectRing(count int, opts ...AddNodeOption) (ids []enode.ID, err error) {
|
|
if count < 2 {
|
|
return nil, errors.New("count of nodes must be at least 2")
|
|
}
|
|
ids, err = s.AddNodes(count, opts...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
err = s.Net.ConnectNodesRing(ids)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ids, nil
|
|
}
|
|
|
|
// AddNodesAndConnectStar is a helpper method that combines
|
|
// AddNodes and ConnectNodesStar.
|
|
func (s *Simulation) AddNodesAndConnectStar(count int, opts ...AddNodeOption) (ids []enode.ID, err error) {
|
|
if count < 2 {
|
|
return nil, errors.New("count of nodes must be at least 2")
|
|
}
|
|
ids, err = s.AddNodes(count, opts...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
err = s.Net.ConnectNodesStar(ids[1:], ids[0])
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ids, nil
|
|
}
|
|
|
|
// UploadSnapshot uploads a snapshot to the simulation
|
|
// This method tries to open the json file provided, applies the config to all nodes
|
|
// and then loads the snapshot into the Simulation network
|
|
func (s *Simulation) UploadSnapshot(snapshotFile string, opts ...AddNodeOption) error {
|
|
f, err := os.Open(snapshotFile)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer func() {
|
|
err := f.Close()
|
|
if err != nil {
|
|
log.Error("Error closing snapshot file", "err", err)
|
|
}
|
|
}()
|
|
jsonbyte, err := ioutil.ReadAll(f)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
var snap simulations.Snapshot
|
|
err = json.Unmarshal(jsonbyte, &snap)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
//the snapshot probably has the property EnableMsgEvents not set
|
|
//just in case, set it to true!
|
|
//(we need this to wait for messages before uploading)
|
|
for _, n := range snap.Nodes {
|
|
n.Node.Config.EnableMsgEvents = true
|
|
n.Node.Config.Services = s.serviceNames
|
|
for _, o := range opts {
|
|
o(n.Node.Config)
|
|
}
|
|
}
|
|
|
|
log.Info("Waiting for p2p connections to be established...")
|
|
|
|
//now we can load the snapshot
|
|
err = s.Net.Load(&snap)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
log.Info("Snapshot loaded")
|
|
return nil
|
|
}
|
|
|
|
// StartNode starts a node by NodeID.
|
|
func (s *Simulation) StartNode(id enode.ID) (err error) {
|
|
return s.Net.Start(id)
|
|
}
|
|
|
|
// StartRandomNode starts a random node.
|
|
func (s *Simulation) StartRandomNode() (id enode.ID, err error) {
|
|
n := s.Net.GetRandomDownNode()
|
|
if n == nil {
|
|
return id, ErrNodeNotFound
|
|
}
|
|
return n.ID(), s.Net.Start(n.ID())
|
|
}
|
|
|
|
// StartRandomNodes starts random nodes.
|
|
func (s *Simulation) StartRandomNodes(count int) (ids []enode.ID, err error) {
|
|
ids = make([]enode.ID, 0, count)
|
|
for i := 0; i < count; i++ {
|
|
n := s.Net.GetRandomDownNode()
|
|
if n == nil {
|
|
return nil, ErrNodeNotFound
|
|
}
|
|
err = s.Net.Start(n.ID())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
ids = append(ids, n.ID())
|
|
}
|
|
return ids, nil
|
|
}
|
|
|
|
// StopNode stops a node by NodeID.
|
|
func (s *Simulation) StopNode(id enode.ID) (err error) {
|
|
return s.Net.Stop(id)
|
|
}
|
|
|
|
// StopRandomNode stops a random node.
|
|
func (s *Simulation) StopRandomNode() (id enode.ID, err error) {
|
|
n := s.Net.GetRandomUpNode()
|
|
if n == nil {
|
|
return id, ErrNodeNotFound
|
|
}
|
|
return n.ID(), s.Net.Stop(n.ID())
|
|
}
|
|
|
|
// StopRandomNodes stops random nodes.
|
|
func (s *Simulation) StopRandomNodes(count int) (ids []enode.ID, err error) {
|
|
ids = make([]enode.ID, 0, count)
|
|
for i := 0; i < count; i++ {
|
|
n := s.Net.GetRandomUpNode()
|
|
if n == nil {
|
|
return nil, ErrNodeNotFound
|
|
}
|
|
err = s.Net.Stop(n.ID())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
ids = append(ids, n.ID())
|
|
}
|
|
return ids, nil
|
|
}
|
|
|
|
// seed the random generator for Simulation.randomNode.
|
|
func init() {
|
|
rand.Seed(time.Now().UnixNano())
|
|
}
|