Skip to content

swarm/storage: fix HashExplore concurrency bug ethersphere#1211 #19028

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
merged 5 commits into from
Feb 12, 2019
Merged

swarm/storage: fix HashExplore concurrency bug ethersphere#1211 #19028

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70d17ed
swarm/storage: fix HashExplore concurrency bug ethersphere#1211
holisticode Feb 8, 2019
ab03f8f
swarm/storage: lock as value not pointer
holisticode Feb 11, 2019
d53cb43
swarm/storage: wait for to complete
holisticode Feb 11, 2019
bb5e51e
swarm/storage: fix linter problems
holisticode Feb 11, 2019
b36816a
swarm/storage: append to nil slice
holisticode Feb 12, 2019
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
5 changes: 5 additions & 0 deletions swarm/storage/filestore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"io"
"sort"
"sync"
)

/*
Expand Down Expand Up @@ -104,6 +105,7 @@ func (f *FileStore) GetAllReferences(ctx context.Context, data io.Reader, toEncr
putter := &HashExplorer{
hasherStore: NewHasherStore(f.ChunkStore, f.hashFunc, toEncrypt),
References: make([]Reference, 0),
lock: &sync.RWMutex{},
}
// do the actual splitting anyway, no way around it
_, _, err = PyramidSplit(ctx, data, putter, putter)
Expand All @@ -123,6 +125,7 @@ func (f *FileStore) GetAllReferences(ctx context.Context, data io.Reader, toEncr
type HashExplorer struct {
*hasherStore
References []Reference
lock *sync.RWMutex
}

// HashExplorer's Put will add just the chunk hashes to its `References`
Expand All @@ -133,6 +136,8 @@ func (he *HashExplorer) Put(ctx context.Context, chunkData ChunkData) (Reference
return nil, err
}
// internally store the reference
he.lock.Lock()
he.References = append(he.References, ref)
he.lock.Unlock()
return ref, nil
}