cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #3198 from filecoin-project/fix/retrieval-streaming-cleanup

Browse Source 
Retrieval CLI fixes
This commit is contained in:
Łukasz Magiera 2020-08-24 22:47:09 +02:00 committed by GitHub
commit 9bc48a8867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/impl/client/client.go
View File

@ -469,8 +469,10 @@ func (a *API) clientRetrieve(ctx context.Context, order api.RetrievalOrder, ref
retrievalResult := make(chan error, 1) retrievalResult := make(chan error, 1)
var dealId retrievalmarket.DealID
unsubscribe := a.Retrieval.SubscribeToEvents(func(event rm.ClientEvent, state rm.ClientDealState) { unsubscribe := a.Retrieval.SubscribeToEvents(func(event rm.ClientEvent, state rm.ClientDealState) {
if state.PayloadCID.Equals(order.Root) { if state.PayloadCID.Equals(order.Root) && state.ID == dealId {
select { select {
case <-ctx.Done(): case <-ctx.Done():
@ -514,7 +516,7 @@ func (a *API) clientRetrieve(ctx context.Context, order api.RetrievalOrder, ref
_ = a.RetrievalStoreMgr.ReleaseStore(store) _ = a.RetrievalStoreMgr.ReleaseStore(store)
}() }()
_, err = a.Retrieval.Retrieve( dealId, err = a.Retrieval.Retrieve(
ctx, ctx,
order.Root, order.Root,
params, params,
@ -531,17 +533,17 @@ func (a *API) clientRetrieve(ctx context.Context, order api.RetrievalOrder, ref
select { select {
case <-ctx.Done(): case <-ctx.Done():
unsubscribe()
finish(xerrors.New("Retrieval Timed Out")) finish(xerrors.New("Retrieval Timed Out"))
return return
case err := <-retrievalResult: case err := <-retrievalResult:
unsubscribe()
if err != nil { if err != nil {
finish(xerrors.Errorf("Retrieve: %w", err)) finish(xerrors.Errorf("Retrieve: %w", err))
return return
} }
} }
unsubscribe()
// If ref is nil, it only fetches the data into the configured blockstore. // If ref is nil, it only fetches the data into the configured blockstore.
if ref == nil { if ref == nil {
finish(nil) finish(nil)