Merge pull request #300 from djkazic/improve-neutrino-performance-with-slow-networks

guggero · web-flow · commit a50a92ab8271 · 2024-06-20T11:12:50.000Z
neutrino: improve perf in high latency networks
diff --git a/neutrino.go b/neutrino.go
@@ -753,7 +753,7 @@ func NewChainService(cfg Config) (*ChainService, error) {
 	if s.persistToDisk {
 		cfg := &chanutils.BatchWriterConfig[*filterdb.FilterData]{
 			QueueBufferSize:        chanutils.DefaultQueueSize,
-			MaxBatch:               1000,
+			MaxBatch:               10,
 			DBWritesTickerDuration: time.Millisecond * 500,
 			PutItems:               s.FilterDB.PutFilters,
 		}
diff --git a/query.go b/query.go
@@ -49,7 +49,7 @@ var (
 	// each peer before we've concluded we aren't going to get a valid
 	// response. This allows to make up for missed messages in some
 	// instances.
-	QueryNumRetries = 2
+	QueryNumRetries = 8
 
 	// QueryPeerConnectTimeout specifies how long to wait for the
 	// underlying chain service to connect to a peer before giving up
diff --git a/rescan.go b/rescan.go
@@ -956,7 +956,7 @@ func (rs *rescanState) handleBlockConnected(ntfn *blockntfns.Connected) error {
 
 	// Otherwise, we'll attempt to fetch the filter to retrieve the relevant
 	// transactions and notify them.
-	queryOptions := NumRetries(0)
+	queryOptions := NumRetries(2)
 	blockFilter, err := chain.GetCFilter(
 		newStamp.Hash, wire.GCSFilterRegular, queryOptions,
 	)

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ func NewChainService(cfg Config) (*ChainService, error) {`
`753`	`753`	`if s.persistToDisk {`
`754`	`754`	`cfg := &chanutils.BatchWriterConfig[*filterdb.FilterData]{`
`755`	`755`	`QueueBufferSize: chanutils.DefaultQueueSize,`
`756`		`- MaxBatch: 1000,`
	`756`	`+ MaxBatch: 10,`
`757`	`757`	`DBWritesTickerDuration: time.Millisecond * 500,`
`758`	`758`	`PutItems: s.FilterDB.PutFilters,`
`759`	`759`	`}`
Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ func (rs rescanState) handleBlockConnected(ntfn blockntfns.Connected) error {`
`956`	`956`
`957`	`957`	`// Otherwise, we'll attempt to fetch the filter to retrieve the relevant`
`958`	`958`	`// transactions and notify them.`
`959`		`- queryOptions := NumRetries(0)`
	`959`	`+ queryOptions := NumRetries(2)`
`960`	`960`	`blockFilter, err := chain.GetCFilter(`
`961`	`961`	`newStamp.Hash, wire.GCSFilterRegular, queryOptions,`
`962`	`962`	`)`