mirror of
https://github.com/ipfs/kubo.git
synced 2026-02-26 21:07:45 +08:00
reverting changes in core/node/libp2p/routing.go
This commit is contained in:
parent
6644657ff0
commit
7b7e528d5f
@ -12,10 +12,7 @@ import (
|
||||
ds "github.com/ipfs/go-datastore"
|
||||
dht "github.com/libp2p/go-libp2p-kad-dht"
|
||||
ddht "github.com/libp2p/go-libp2p-kad-dht/dual"
|
||||
dreprovider "github.com/libp2p/go-libp2p-kad-dht/dual/reprovider"
|
||||
"github.com/libp2p/go-libp2p-kad-dht/fullrt"
|
||||
"github.com/libp2p/go-libp2p-kad-dht/reprovider"
|
||||
reproviderds "github.com/libp2p/go-libp2p-kad-dht/reprovider/datastore"
|
||||
pubsub "github.com/libp2p/go-libp2p-pubsub"
|
||||
namesys "github.com/libp2p/go-libp2p-pubsub-router"
|
||||
record "github.com/libp2p/go-libp2p-record"
|
||||
@ -59,7 +56,6 @@ type processInitialRoutingOut struct {
|
||||
|
||||
Router Router `group:"routers"`
|
||||
ContentRouter routing.ContentRouting `group:"content-routers"`
|
||||
Reprovider reprovider.Reprovider
|
||||
|
||||
DHT *ddht.DHT
|
||||
DHTClient routing.Routing `name:"dhtc"`
|
||||
@ -123,24 +119,6 @@ func BaseRouting(cfg *config.Config) interface{} {
|
||||
},
|
||||
})
|
||||
|
||||
mhStore, err := reproviderds.NewMHStore(context.Background(), in.Repo.Datastore())
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
sweepingReprovider, err := reprovider.NewReprovider(context.Background(),
|
||||
reprovider.WithMHStore(mhStore),
|
||||
reprovider.WithRouter(fullRTClient),
|
||||
reprovider.WithMessageSender(fullRTClient.MessageSender()),
|
||||
reprovider.WithReplicationFactor(20),
|
||||
reprovider.WithReprovideInterval(22*time.Hour),
|
||||
reprovider.WithMaxReprovideDelay(time.Hour),
|
||||
reprovider.WithConnectivityCheckOnlineInterval(time.Minute),
|
||||
reprovider.WithConnectivityCheckOfflineInterval(time.Minute),
|
||||
)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
|
||||
// we want to also use the default HTTP routers, so wrap the FullRT client
|
||||
// in a parallel router that calls them in parallel
|
||||
httpRouters, err := constructDefaultHTTPRouters(cfg)
|
||||
@ -161,31 +139,9 @@ func BaseRouting(cfg *config.Config) interface{} {
|
||||
DHT: dualDHT,
|
||||
DHTClient: fullRTClient,
|
||||
ContentRouter: fullRTClient,
|
||||
Reprovider: sweepingReprovider,
|
||||
}, nil
|
||||
}
|
||||
|
||||
mhStore, err := reproviderds.NewMHStore(context.Background(),
|
||||
in.Repo.Datastore(),
|
||||
reproviderds.WithPrefixLen(10),
|
||||
reproviderds.WithDatastorePrefix("/reprovider/mhs"),
|
||||
reproviderds.WithGCInterval(22*time.Hour),
|
||||
reproviderds.WithGCBatchSize(1<<14), // ~544 KiB per batch (34 bytes per multihash)
|
||||
)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
sweepingReprovider, err := dreprovider.NewSweepingReprovider(dualDHT,
|
||||
dreprovider.WithMHStore(mhStore),
|
||||
dreprovider.WithReprovideInterval(22*time.Hour),
|
||||
dreprovider.WithMaxWorkers(4),
|
||||
dreprovider.WithDedicatedPeriodicWorkers(2),
|
||||
dreprovider.WithDedicatedBurstWorkers(1),
|
||||
dreprovider.WithMaxProvideConnsPerWorker(20),
|
||||
)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
return processInitialRoutingOut{
|
||||
Router: Router{
|
||||
Priority: 1000,
|
||||
@ -194,7 +150,6 @@ func BaseRouting(cfg *config.Config) interface{} {
|
||||
DHT: dualDHT,
|
||||
DHTClient: dualDHT,
|
||||
ContentRouter: in.Router,
|
||||
Reprovider: sweepingReprovider,
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user