You need to sign in or sign up before continuing.
  1. 18 Feb, 2019 1 commit
    • Ferenc Szabo's avatar
      p2p, swarm: fix node up races by granular locking (#18976) · 50b872bf
      Ferenc Szabo authored
      * 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 85a79b3a,
      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.
      50b872bf
  2. 11 Jan, 2019 1 commit
  3. 17 Dec, 2018 1 commit
  4. 24 Sep, 2018 1 commit
    • Felix Lange's avatar
      all: new p2p node representation (#17643) · 30cd5c18
      Felix Lange authored
      Package p2p/enode provides a generalized representation of p2p nodes
      which can contain arbitrary information in key/value pairs. It is also
      the new home for the node database. The "v4" identity scheme is also
      moved here from p2p/enr to remove the dependency on Ethereum crypto from
      that package.
      
      Record signature handling is changed significantly. The identity scheme
      registry is removed and acceptable schemes must be passed to any method
      that needs identity. This means records must now be validated explicitly
      after decoding.
      
      The enode API is designed to make signature handling easy and safe: most
      APIs around the codebase work with enode.Node, which is a wrapper around
      a valid record. Going from enr.Record to enode.Node requires a valid
      signature.
      
      * p2p/discover: port to p2p/enode
      
      This ports the discovery code to the new node representation in
      p2p/enode. The wire protocol is unchanged, this can be considered a
      refactoring change. The Kademlia table can now deal with nodes using an
      arbitrary identity scheme. This requires a few incompatible API changes:
      
        - Table.Lookup is not available anymore. It used to take a public key
          as argument because v4 protocol requires one. Its replacement is
          LookupRandom.
        - Table.Resolve takes *enode.Node instead of NodeID. This is also for
          v4 protocol compatibility because nodes cannot be looked up by ID
          alone.
        - Types Node and NodeID are gone. Further commits in the series will be
          fixes all over the the codebase to deal with those removals.
      
      * p2p: port to p2p/enode and discovery changes
      
      This adapts package p2p to the changes in p2p/discover. All uses of
      discover.Node and discover.NodeID are replaced by their equivalents from
      p2p/enode.
      
      New API is added to retrieve the enode.Node instance of a peer. The
      behavior of Server.Self with discovery disabled is improved. It now
      tries much harder to report a working IP address, falling back to
      127.0.0.1 if no suitable address can be determined through other means.
      These changes were needed for tests of other packages later in the
      series.
      
      * p2p/simulations, p2p/testing: port to p2p/enode
      
      No surprises here, mostly replacements of discover.Node, discover.NodeID
      with their new equivalents. The 'interesting' API changes are:
      
       - testing.ProtocolSession tracks complete nodes, not just their IDs.
       - adapters.NodeConfig has a new method to create a complete node.
      
      These changes were needed to make swarm tests work.
      
      Note that the NodeID change makes the code incompatible with old
      simulation snapshots.
      
      * whisper/whisperv5, whisper/whisperv6: port to p2p/enode
      
      This port was easy because whisper uses []byte for node IDs and
      URL strings in the API.
      
      * eth: port to p2p/enode
      
      Again, easy to port because eth uses strings for node IDs and doesn't
      care about node information in any way.
      
      * les: port to p2p/enode
      
      Apart from replacing discover.NodeID with enode.ID, most changes are in
      the server pool code. It now deals with complete nodes instead
      of (Pubkey, IP, Port) triples. The database format is unchanged for now,
      but we should probably change it to use the node database later.
      
      * node: port to p2p/enode
      
      This change simply replaces discover.Node and discover.NodeID with their
      new equivalents.
      
      * swarm/network: port to p2p/enode
      
      Swarm has its own node address representation, BzzAddr, containing both
      an overlay address (the hash of a secp256k1 public key) and an underlay
      address (enode:// URL).
      
      There are no changes to the BzzAddr format in this commit, but certain
      operations such as creating a BzzAddr from a node ID are now impossible
      because node IDs aren't public keys anymore.
      
      Most swarm-related changes in the series remove uses of
      NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
      as argument. ToOverlayAddr is removed because we can just use the node
      ID directly.
      30cd5c18
  5. 30 Jul, 2018 1 commit
    • holisticode's avatar
      Merge netsim mig to master (#17241) · d6efa691
      holisticode authored
      * swarm: merged stream-tests migration to develop
      
      * swarm/network: expose simulation RandomUpNode to use in stream tests
      
      * swarm/network: wait for subs in PeerEvents and fix stream.runSyncTest
      
      * swarm: enforce waitkademlia for snapshot tests
      
      * swarm: fixed syncer tests and snapshot_sync_test
      
      * swarm: linting of simulation package
      
      * swarm: address review comments
      
      * swarm/network/stream: fix delivery_test bugs and refactor
      
      * swarm/network/stream: addressed PR comments @janos
      
      * swarm/network/stream: enforce waitKademlia, improve TestIntervals
      
      * swarm/network/stream: TestIntervals not waiting for chunk to be stored
      d6efa691
  6. 23 Jul, 2018 1 commit
    • Janoš Guljaš's avatar
      swarm: network simulation for swarm tests (#769) · dcaaa3c8
      Janoš Guljaš authored
      * cmd/swarm: minor cli flag text adjustments
      
      * cmd/swarm, swarm/storage, swarm: fix  mingw on windows test issues
      
      * cmd/swarm: support for smoke tests on the production swarm cluster
      
      * cmd/swarm/swarm-smoke: simplify cluster logic as per suggestion
      
      * changed colour of landing page
      
      * landing page reacts to enter keypress
      
      * swarm/api/http: sticky footer for swarm landing page using flex
      
      * swarm/api/http: sticky footer for error pages and fix for multiple choices
      
      * swarm: propagate ctx to internal apis (#754)
      
      * swarm/simnet: add basic node/service functions
      
      * swarm/netsim: add buckets for global state and kademlia health check
      
      * swarm/netsim: Use sync.Map as bucket and provide cleanup function for...
      
      * swarm, swarm/netsim: adjust SwarmNetworkTest
      
      * swarm/netsim: fix tests
      
      * swarm: added visualization option to sim net redesign
      
      * swarm/netsim: support multiple services per node
      
      * swarm/netsim: remove redundant return statement
      
      * swarm/netsim: add comments
      
      * swarm: shutdown HTTP in Simulation.Close
      
      * swarm: sim HTTP server timeout
      
      * swarm/netsim: add more simulation methods and peer events examples
      
      * swarm/netsim: add WaitKademlia example
      
      * swarm/netsim: fix comments
      
      * swarm/netsim: terminate peer events goroutines on simulation done
      
      * swarm, swarm/netsim: naming updates
      
      * swarm/netsim: return not healthy kademlias on WaitTillHealthy
      
      * swarm: fix WaitTillHealthy call in testSwarmNetwork
      
      * swarm/netsim: allow bucket to have any type for a key
      
      * swarm: Added snapshots to new netsim
      
      * swarm/netsim: add more tests for bucket
      
      * swarm/netsim: move http related things into separate files
      
      * swarm/netsim: add AddNodeWithService option
      
      * swarm/netsim: add more tests and Start* methods
      
      * swarm/netsim: add peer events and kademlia tests
      
      * swarm/netsim: fix some tests flakiness
      
      * swarm/netsim: improve random nodes selection, fix TestStartStop* tests
      
      * swarm/netsim: remove time measurement from TestClose to avoid flakiness
      
      * swarm/netsim: builder pattern for netsim HTTP server (#773)
      
      * swarm/netsim: add connect related tests
      
      * swarm/netsim: add comment for TestPeerEvents
      
      * swarm: rename netsim package to network/simulation
      dcaaa3c8