Fix deadlock in the inmemory storage driver
According golang documentation [1]: no goroutine should expect to be able to acquire a read lock until the initial read lock is released. [1] https://golang.org/pkg/sync/#RWMutex Signed-off-by: Gladkov Alexey <agladkov@redhat.com>
This commit is contained in:
parent
f0cc927784
commit
fc7e8f42d7
1 changed files with 5 additions and 1 deletions
|
@ -73,7 +73,7 @@ func (d *driver) GetContent(ctx context.Context, path string) ([]byte, error) {
|
|||
d.mutex.RLock()
|
||||
defer d.mutex.RUnlock()
|
||||
|
||||
rc, err := d.Reader(ctx, path, 0)
|
||||
rc, err := d.reader(ctx, path, 0)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -108,6 +108,10 @@ func (d *driver) Reader(ctx context.Context, path string, offset int64) (io.Read
|
|||
d.mutex.RLock()
|
||||
defer d.mutex.RUnlock()
|
||||
|
||||
return d.reader(ctx, path, offset)
|
||||
}
|
||||
|
||||
func (d *driver) reader(ctx context.Context, path string, offset int64) (io.ReadCloser, error) {
|
||||
if offset < 0 {
|
||||
return nil, storagedriver.InvalidOffsetError{Path: path, Offset: offset}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue