JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "satellite/metainfo: log if replacing pieces in pointer goes wrong"

Browse Source 
This reverts commit 9edb363558.

Change-Id: Ia6219f4cca4e766c7919a6d830dfa6900fd4f6e0
This commit is contained in:
Cameron Ayer 2020-07-20 09:17:04 -04:00 committed by Cameron
parent e14f7a3fb4
commit 46bdb1dbfe
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
satellite/metainfo/service.go
View File

@ -5,7 +5,6 @@ package metainfo
import (
"context"
"fmt"
"time"
"github.com/zeebo/errs"
@ -150,7 +149,7 @@ func (s *Service) UpdatePiecesCheckDuplicates(ctx context.Context, path string,
}
}
// remove the toRemove pieces from the map
// only if piece number and node id match
// only if all piece number, node id and hash match
for _, piece := range toRemove {
if piece == nil {
continue
@ -166,15 +165,8 @@ func (s *Service) UpdatePiecesCheckDuplicates(ctx context.Context, path string,
if piece == nil {
continue
}
piece.Hash = nil
_, exists := pieceMap[piece.PieceNum]
if exists {
// temporary logging to get some insight into this error
s.logger.Info("temporary logging around error: 'piece to add already exists'",
zap.String("old pointer", fmt.Sprintf("%v", ref.GetRemote().GetRemotePieces())),
zap.String("latest pointer", fmt.Sprintf("%v", pointer.GetRemote().GetRemotePieces())),
zap.String("nodes to remove", fmt.Sprintf("%v", toRemove)),
zap.String("nodes to add", fmt.Sprintf("%v", toAdd)))
return nil, Error.New("piece to add already exists (piece no: %d)", piece.PieceNum)
}
pieceMap[piece.PieceNum] = piece