JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deadlock on testplanet shutdown (#798)

Browse Source
This commit is contained in:
Kaloyan Raev 2018-12-07 20:31:59 +02:00 committed by GitHub
parent 72a20af569
commit c025c13706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/testplanet/node.go
View File

@ -96,6 +96,9 @@ func (node *Node) Addr() string { return node.Info.Address.Address }
// Shutdown shuts down all node dependencies
func (node *Node) Shutdown() error {
var errs []error
if node.Kademlia != nil {
errs = append(errs, node.Kademlia.Disconnect())
}
if node.Provider != nil {
errs = append(errs, node.Provider.Close())
}
@ -103,9 +106,6 @@ func (node *Node) Shutdown() error {
// if node.Listener != nil {
// errs = append(errs, node.Listener.Close())
// }
if node.Kademlia != nil {
errs = append(errs, node.Kademlia.Disconnect())
}
for _, dep := range node.Dependencies {
err := dep.Close()

14
pkg/kademlia/kademlia.go
View File

@ -9,6 +9,8 @@ import (
"net"
"os"
"path/filepath"
"sync/atomic"
"unsafe"
"github.com/gogo/protobuf/proto"
"github.com/zeebo/errs"
@ -52,6 +54,7 @@ type Kademlia struct {
address string
nodeClient node.Client
identity *provider.FullIdentity
bootstrapCancel unsafe.Pointer // context.CancelFunc
}
// NewKademlia returns a newly configured Kademlia instance
@ -108,6 +111,12 @@ func NewKademliaWithRoutingTable(self pb.Node, bootstrapNodes []pb.Node, identit
// Disconnect safely closes connections to the Kademlia network
func (k *Kademlia) Disconnect() error {
// Cancel the bootstrap context
ptr := atomic.LoadPointer(&k.bootstrapCancel)
if ptr != nil {
(*(*context.CancelFunc)(ptr))()
}
return utils.CombineErrors(
k.nodeClient.Disconnect(),
k.routingTable.Close(),
@ -172,7 +181,10 @@ func (k *Kademlia) Bootstrap(ctx context.Context) error {
return BootstrapErr.New("no bootstrap nodes provided")
}
return k.lookup(ctx, k.routingTable.self.Id, discoveryOptions{
bootstrapContext, bootstrapCancel := context.WithCancel(ctx)
atomic.StorePointer(&k.bootstrapCancel, unsafe.Pointer(&bootstrapCancel))
return k.lookup(bootstrapContext, k.routingTable.self.Id, discoveryOptions{
concurrency: k.alpha, retries: defaultRetries, bootstrap: true, bootstrapNodes: k.bootstrapNodes,
})
}