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(reserve-repair): only run on one unique item at a time #4700

Closed
wants to merge 1 commit into from
Closed

fix(reserve-repair): only run on one unique item at a time #4700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkg/puller/puller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,10 +343,10 @@ func (p *Puller) syncPeerBin(parentCtx context.Context, peer *syncPeer, bin uint
if err != nil {
p.metrics.SyncWorkerErrCounter.Inc()
if errors.Is(err, p2p.ErrPeerNotFound) {
p.logger.Debug("syncWorker interval failed, quitting", "error", err, "peer_address", address, "bin", bin, "cursor", address, "start", start, "topmost", top)
p.logger.Debug("syncWorker interval failed, quitting", "error", err, "peer_address", address, "bin", bin, "cursor", cursor, "start", start, "topmost", top)
return
}
loggerV2.Debug("syncWorker interval failed", "error", err, "peer_address", address, "bin", bin, "cursor", address, "start", start, "topmost", top)
loggerV2.Debug("syncWorker interval failed", "error", err, "peer_address", address, "bin", bin, "cursor", cursor, "start", start, "topmost", top)
}

if isHistorical {
Expand Down
12 changes: 10 additions & 2 deletions pkg/storer/migration/reserveRepair.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/ethersphere/bee/v2/pkg/storer/internal/transaction"
"github.com/ethersphere/bee/v2/pkg/swarm"
"golang.org/x/sync/errgroup"
"resenje.org/multex"
)

// ReserveRepairer is a migration step that removes all BinItem entries and migrates
Expand Down Expand Up @@ -164,9 +165,15 @@ func ReserveRepairer(
var eg errgroup.Group
eg.SetLimit(runtime.NumCPU())

locker := multex.New()

for _, item := range batchRadiusItems {
func(item *reserve.BatchRadiusItem) {
eg.Go(func() error {

locker.Lock(item.ID())
defer locker.Unlock(item.ID())

return st.Run(context.Background(), func(s transaction.Store) error {

chunk, err := s.ChunkStore().Get(context.Background(), item.Address)
Expand Down Expand Up @@ -236,11 +243,12 @@ func ReserveRepairer(
return err
}

logger.Info("migrated all chunk entries", "new_size", batchRadiusCnt, "missing_chunks", missingChunks.Load(), "invalid_sharky_chunks", invalidSharkyChunks.Load())

if batchRadiusCnt != chunkBinCnt {
return errors.New("index counts do not match")
return fmt.Errorf("index counts do not match, %d vs %d", batchRadiusCnt, chunkBinCnt)
}

logger.Info("migrated all chunk entries", "new_size", batchRadiusCnt, "missing_chunks", missingChunks.Load(), "invalid_sharky_chunks", invalidSharkyChunks.Load())
return nil
}
}
Loading