Skip to content

Commit

Permalink
neutrino+query: use BatchWriter for filter persistance
Browse files Browse the repository at this point in the history
  • Loading branch information
ellemouton committed Jul 11, 2023
1 parent c74c72f commit 5c5c7bd
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 7 deletions.
26 changes: 26 additions & 0 deletions neutrino.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/lightninglabs/neutrino/banman"
"github.com/lightninglabs/neutrino/blockntfns"
"github.com/lightninglabs/neutrino/cache/lru"
"github.com/lightninglabs/neutrino/chanutils"
"github.com/lightninglabs/neutrino/filterdb"
"github.com/lightninglabs/neutrino/headerfs"
"github.com/lightninglabs/neutrino/pushtx"
Expand Down Expand Up @@ -661,6 +662,7 @@ type ChainService struct { // nolint:maligned
broadcaster *pushtx.Broadcaster
banStore banman.Store
workManager query.WorkManager
filterBatchWriter *chanutils.BatchWriter[*filterdb.FilterData]

// peerSubscribers is a slice of active peer subscriptions, that we
// will notify each time a new peer is connected.
Expand Down Expand Up @@ -748,6 +750,22 @@ func NewChainService(cfg Config) (*ChainService, error) {
return nil, err
}

if s.persistToDisk {
cfg := &chanutils.BatchWriterConfig[*filterdb.FilterData]{
QueueBufferSize: chanutils.DefaultQueueSize,
MaxBatch: 1000,
DBWritesTickerDuration: time.Millisecond * 500,
Logger: log,
PutItems: s.FilterDB.PutFilters,
}

batchWriter := chanutils.NewBatchWriter[*filterdb.FilterData](
cfg,
)

s.filterBatchWriter = batchWriter
}

filterCacheSize := DefaultFilterCacheSize
if cfg.FilterCacheSize != 0 {
filterCacheSize = cfg.FilterCacheSize
Expand Down Expand Up @@ -1606,6 +1624,10 @@ func (s *ChainService) Start() error {
err)
}

if s.persistToDisk {
s.filterBatchWriter.Start()
}

go s.connManager.Start()

// Start the peer handler which in turn starts the address and block
Expand Down Expand Up @@ -1645,6 +1667,10 @@ func (s *ChainService) Stop() error {
returnErr = err
}

if s.persistToDisk {
s.filterBatchWriter.Stop()
}

// Signal the remaining goroutines to quit.
close(s.quit)
s.wg.Wait()
Expand Down
9 changes: 2 additions & 7 deletions query.go
Original file line number Diff line number Diff line change
Expand Up @@ -534,16 +534,11 @@ func (q *cfiltersQuery) handleResponse(req, resp wire.Message,
}

if q.cs.persistToDisk {
filterData := &filterdb.FilterData{
q.cs.filterBatchWriter.AddItem(&filterdb.FilterData{
Filter: filter,
BlockHash: &response.BlockHash,
Type: dbFilterType,
}

err = q.cs.FilterDB.PutFilters(filterData)
if err != nil {
log.Warnf("Couldn't write filter to filterDB: %v", err)
}
})
}

// We delete the entry for this filter from the headerIndex to indicate
Expand Down

0 comments on commit 5c5c7bd

Please sign in to comment.