Skip to content

fix: remove bootstrap in dht #5587

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

Merged
simlecode merged 1 commit into from
Dec 19, 2022
Merged

fix: remove bootstrap in dht #5587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions app/submodule/network/network_submodule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,6 @@ func NewNetworkSubmodule(ctx context.Context, chainStore *chain.Store,
}

// set up host
var peerMgr peermgr.IPeerMgr

rawHost, err := buildHost(ctx, config, libP2pOpts, config.Repo().Config())
if err != nil {
return nil, err
Expand All @@ -163,7 +161,7 @@ func NewNetworkSubmodule(ctx context.Context, chainStore *chain.Store,
return nil, err
}

peerMgr, err = peermgr.NewPeerMgr(peerHost, router.(*dht.IpfsDHT), period, bootNodes)
peerMgr, err := peermgr.NewPeerMgr(peerHost, router.(*dht.IpfsDHT), period, bootNodes)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -344,7 +342,7 @@ func buildHost(ctx context.Context, config networkConfig, libP2pOpts []libp2p.Op
}

relayHost, err := libp2p.New(
libp2p.EnableRelay(), // TODO ?
libp2p.EnableRelay(),
libp2p.EnableAutoRelay(),
publicAddrFactory,
libp2p.ChainOptions(libP2pOpts...),
Expand Down Expand Up @@ -375,8 +373,7 @@ func makeDHT(ctx context.Context, h types.RawHost, config networkConfig, network
dht.ProtocolPrefix(net.FilecoinDHT(networkName)),
dht.QueryFilter(dht.PublicQueryFilter),
dht.RoutingTableFilter(dht.PublicRoutingTableFilter),
dht.DisableProviders(),
dht.BootstrapPeers(bootNodes...),
dht.DisableProviders(), //do not add dht bootstrap.make the peer-mgr unable to work
dht.DisableValues(),
}
r, err := dht.New(
Expand Down
16 changes: 10 additions & 6 deletions pkg/net/peermgr/peermgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,19 @@ func (pmgr *PeerMgr) Stop(ctx context.Context) error {

func (pmgr *PeerMgr) Run(ctx context.Context) {
tick := time.NewTicker(pmgr.period)
defer tick.Stop()

for {
pCount := pmgr.getPeerCount()
if pCount < pmgr.minFilPeers {
pmgr.expandPeers()
} else if pCount > pmgr.maxFilPeers {
log.Debugf("peer count about threshold: %d > %d", pCount, pmgr.maxFilPeers)
}

select {
case <-tick.C:
pcount := pmgr.getPeerCount()
if pcount < pmgr.minFilPeers {
pmgr.expandPeers()
} else if pcount > pmgr.maxFilPeers {
log.Debugf("peer count about threshold: %d > %d", pcount, pmgr.maxFilPeers)
}
continue
case <-pmgr.done:
log.Warn("exiting peermgr run")
return
Expand Down