Skip to content

Commit

Permalink
les: close all connected les-server when shutdown (ethereum#21426)
Browse files Browse the repository at this point in the history
* les: close all connected les-server when shutdown

* les: linter nitpick

Co-authored-by: Martin Holst Swende <[email protected]>
  • Loading branch information
2 people authored and enriquefynn committed Feb 15, 2021
1 parent b4db014 commit 0982a64
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 0 deletions.
39 changes: 39 additions & 0 deletions les/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -1288,3 +1288,42 @@ func (ps *serverPeerSet) close() {
}
ps.closed = true
}

// serverSet is a special set which contains all connected les servers.
// Les servers will also be discovered by discovery protocol because they
// also run the LES protocol. We can't drop them although they are useless
// for us(server) but for other protocols(e.g. ETH) upon the devp2p they
// may be useful.
type serverSet struct {
lock sync.Mutex
set map[string]*clientPeer
closed bool
}

func newServerSet() *serverSet {
return &serverSet{set: make(map[string]*clientPeer)}
}

func (s *serverSet) register(peer *clientPeer) error {
s.lock.Lock()
defer s.lock.Unlock()

if s.closed {
return errClosed
}
if _, exist := s.set[peer.id]; exist {
return errAlreadyRegistered
}
s.set[peer.id] = peer
return nil
}

func (s *serverSet) close() {
s.lock.Lock()
defer s.lock.Unlock()

for _, p := range s.set {
p.Disconnect(p2p.DiscQuitting)
}
s.closed = true
}
5 changes: 5 additions & 0 deletions les/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ type LesServer struct {

archiveMode bool // Flag whether the ethereum node runs in archive mode.
peers *clientPeerSet
serverset *serverSet
handler *serverHandler
lesTopics []discv5.Topic
privateKey *ecdsa.PrivateKey
Expand Down Expand Up @@ -83,6 +84,7 @@ func NewLesServer(node *node.Node, e *eth.Ethereum, config *eth.Config) (*LesSer
},
archiveMode: e.ArchiveMode(),
peers: newClientPeerSet(),
serverset: newServerSet(),
lesTopics: lesTopics,
fcManager: flowcontrol.NewClientManager(nil, &mclock.System{}),
servingQueue: newServingQueue(int64(time.Millisecond*10), float64(config.LightServ)/100),
Expand Down Expand Up @@ -196,6 +198,9 @@ func (s *LesServer) Start() error {
func (s *LesServer) Stop() error {
close(s.closeCh)

// Disconnect existing connections with other LES servers.
s.serverset.close()

// Disconnect existing sessions.
// This also closes the gate for any new registrations on the peer set.
// sessions which are already established but not added to pm.peers yet
Expand Down
3 changes: 3 additions & 0 deletions les/server_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ func (h *serverHandler) handle(p *clientPeer) error {
return err
}
if p.server {
if err := h.server.serverset.register(p); err != nil {
return err
}
// connected to another server, no messages expected, just wait for disconnection
_, err := p.rw.ReadMsg()
return err
Expand Down

0 comments on commit 0982a64

Please sign in to comment.