Skip to content
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

exp/lighthorizon: Fix the single-process index builder data race. #4470

Merged
merged 4 commits into from
Jul 21, 2022
Merged

exp/lighthorizon: Fix the single-process index builder data race. #4470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91c62f5
"Fix" the data race by not doing any flushes until the end
Shaptic Jul 20, 2022
1309a2b
Create parallel_flush.go
sreuland Jul 21, 2022
2c33087
Add synchronization for the work submission routine. Thank you @sreul…
Shaptic Jul 21, 2022
c177e37
Merge branch 'lighthorizon_fixRace' of github.com:Shaptic/go into lig…
Shaptic Jul 21, 2022
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
11 changes: 9 additions & 2 deletions exp/lighthorizon/index/backend/parallel_flush.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ func parallelFlush(parallel uint32, allIndexes map[string]types.NamedIndices, f

batches := make(chan *batch, parallel)

wg.Add(1)
go func() {
// forces this async func to be waited on also, otherwise the outer
// method returns before this finishes.
defer wg.Done()

for account, indexes := range allIndexes {
batches <- &batch{
account: account,
Expand All @@ -41,15 +46,17 @@ func parallelFlush(parallel uint32, allIndexes map[string]types.NamedIndices, f
defer wg.Done()
for batch := range batches {
if err := f(batch); err != nil {
log.Error(err)
log.Errorf("Error occurred writing batch: %v, retrying...", err)
time.Sleep(50 * time.Millisecond)
batches <- batch
continue
}

nwritten := atomic.AddUint64(&written, 1)
if nwritten%1000 == 0 {
log.Infof("Writing indexes... %d/%d %.2f%%", nwritten, len(allIndexes), (float64(nwritten)/float64(len(allIndexes)))*100)
log.Infof("Writing indexes... %d/%d %.2f%%", nwritten,
len(allIndexes),
(float64(nwritten)/float64(len(allIndexes)))*100)
}

if nwritten == uint64(len(allIndexes)) {
Expand Down
2 changes: 1 addition & 1 deletion exp/lighthorizon/index/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func BuildIndices(
}

nprocessed := atomic.AddUint64(&processed, uint64(count))
if nprocessed%19 == 0 {
if nprocessed%97 == 0 {
printProgress("Reading ledgers", nprocessed, uint64(ledgerCount), startTime)
}

Expand Down
3 changes: 1 addition & 2 deletions exp/lighthorizon/index/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"fmt"
"net/url"
"path/filepath"
"runtime"

"github.com/aws/aws-sdk-go/aws"

Expand All @@ -17,7 +16,7 @@ func Connect(backendUrl string) (Store, error) {

func ConnectWithConfig(config StoreConfig) (Store, error) {
if config.Workers <= 0 {
config.Workers = uint32(runtime.NumCPU()) - 1
config.Workers = 1
}

parsed, err := url.Parse(config.Url)
Expand Down