fix:current writes map (#182)

This commit is contained in:
Tracey Lesley authored and GitHub committed 2023-08-12 13:45:01 +08:00
1 parent 85ef8d3be4
commit e63cfca82a
1 file changed
+11 -1
+11 -1
View File
@@ -48,6 +48,7 @@ type Downloader struct {
listener Listener listener Listener
lock *sync.Mutex lock *sync.Mutex
fetcherMapLock *sync.RWMutex
closed atomic.Bool closed atomic.Bool
} }
@@ -65,6 +66,7 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
storage: cfg.Storage, storage: cfg.Storage,
lock: &sync.Mutex{}, lock: &sync.Mutex{},
fetcherMapLock: &sync.RWMutex{},
} }
for _, f := range cfg.FetchBuilders { for _, f := range cfg.FetchBuilders {
for _, p := range f.Schemes() { for _, p := range f.Schemes() {
@@ -198,7 +200,9 @@ func (d *Downloader) Resolve(req *base.Request) (rr *ResolveResult, err error) {
if err != nil { if err != nil {
return return
} }
d.fetcherMapLock.Lock()
d.fetcherMap[rrId] = fetcher d.fetcherMap[rrId] = fetcher
d.fetcherMapLock.Unlock()
rr = &ResolveResult{ rr = &ResolveResult{
ID: rrId, ID: rrId,
Res: fetcher.Meta().Res, Res: fetcher.Meta().Res,
@@ -218,11 +222,17 @@ func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err
if opts == nil { if opts == nil {
opts = &base.Options{} opts = &base.Options{}
} }
d.fetcherMapLock.RLock()
fetcher, ok := d.fetcherMap[rrId] fetcher, ok := d.fetcherMap[rrId]
d.fetcherMapLock.RUnlock()
if !ok { if !ok {
return "", errors.New("invalid resource id") return "", errors.New("invalid resource id")
} }
defer delete(d.fetcherMap, rrId) defer func() {
d.fetcherMapLock.Lock()
delete(d.fetcherMap, rrId)
d.fetcherMapLock.Unlock()
}()
meta := fetcher.Meta() meta := fetcher.Meta()
meta.Opts = opts meta.Opts = opts