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

Jump to bottom

fix(share/availability): propagate errors from light availability properly #3888

Merged
merged 2 commits into from
Oct 29, 2024
Merged

fix(share/availability): propagate errors from light availability properly #3888

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74df5af
propagate errors in light sampling properly
walldiss Oct 28, 2024
413ffdc
Merge branch 'main' into light-avail-errors
walldiss Oct 29, 2024
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
15 changes: 8 additions & 7 deletions share/availability/light/availability.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package light
import (
"context"
"errors"
"fmt"
"sync"

"github.com/ipfs/go-datastore"
Expand Down Expand Up @@ -123,19 +124,19 @@ func (la *ShareAvailability) SharesAvailable(ctx context.Context, header *header
}
wg.Wait()

if errors.Is(ctx.Err(), context.Canceled) {
// Availability did not complete due to context cancellation, return context error instead of
// share.ErrNotAvailable
return ctx.Err()
}

// store the result of the sampling session
bs := encodeSamples(failedSamples)
la.dsLk.Lock()
err = la.ds.Put(ctx, key, bs)
la.dsLk.Unlock()
if err != nil {
log.Errorw("Failed to store sampling result", "error", err)
return fmt.Errorf("failed to store sampling result: %w", err)
walldiss marked this conversation as resolved.
Show resolved Hide resolved
}

if errors.Is(ctx.Err(), context.Canceled) {
// Availability did not complete due to context cancellation, return context error instead of
// share.ErrNotAvailable
return ctx.Err()
}

// if any of the samples failed, return an error
Expand Down