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

Fix success handling in Retreival #5921

Merged
merged 4 commits into from
Jun 4, 2021
Merged

Fix success handling in Retreival #5921

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8733cea
fix success handling in retreival
aarshkshah1992 Mar 31, 2021
182da9d
fix error handling
aarshkshah1992 Mar 31, 2021
ed4748e
fix bug
aarshkshah1992 Apr 2, 2021
35a466f
add new line
aarshkshah1992 Apr 2, 2021
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
17 changes: 14 additions & 3 deletions cli/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,8 @@ var clientRetrieveCmd = &cli.Command{
return xerrors.Errorf("error setting up retrieval: %w", err)
}

var prevStatus retrievalmarket.DealStatus

for {
select {
case evt, ok := <-updates:
Expand All @@ -1195,14 +1197,23 @@ var clientRetrieveCmd = &cli.Command{
retrievalmarket.ClientEvents[evt.Event],
retrievalmarket.DealStatuses[evt.Status],
)
} else {
afmt.Println("Success")
return nil
prevStatus = evt.Status
}

if evt.Err != "" {
return xerrors.Errorf("retrieval failed: %s", evt.Err)
}

if !ok {
if prevStatus == retrievalmarket.DealStatusCompleted {
afmt.Println("Success")
} else {
afmt.Printf("saw final deal state %s instead of expected success state DealStatusCompleted\n",
retrievalmarket.DealStatuses[prevStatus])
}
return nil
}

case <-ctx.Done():
return xerrors.Errorf("retrieval timed out")
}
Expand Down