TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2025-01-09 21:19:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3626 from nspcc-dev/uploader-errors

Browse source 
cli: adjust error of `upload-bin` command
This commit is contained in:
Anna Shaleva 2024-10-18 14:28:02 +03:00 committed by GitHub
commit 8e1fdd5d70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/util/uploader.go
View file

@ -205,6 +205,7 @@ func retry(action func() error) error {
type searchResult struct { type searchResult struct {
startIndex int startIndex int
endIndex int
numOIDs int numOIDs int
err error err error
} }
@ -248,14 +249,14 @@ func fetchLatestMissingBlockIndex(ctx context.Context, p *pool.Pool, containerID
objectIDs, err = neofs.ObjectSearch(ctx, p, priv, containerID.String(), prm) objectIDs, err = neofs.ObjectSearch(ctx, p, priv, containerID.String(), prm)
return err return err
}) })
results[i] = searchResult{startIndex: startIndex, numOIDs: len(objectIDs), err: err} results[i] = searchResult{startIndex: startIndex, endIndex: endIndex, numOIDs: len(objectIDs), err: err}
}(i, startIndex, endIndex) }(i, startIndex, endIndex)
} }
wg.Wait() wg.Wait()
for i := len(results) - 1; i >= 0; i-- { for i := len(results) - 1; i >= 0; i-- {
if results[i].err != nil { if results[i].err != nil {
return 0, fmt.Errorf("search of index files failed for batch with indexes from %d to %d: %w", batch*searchBatchSize, (batch+1)*searchBatchSize, results[i].err) return 0, fmt.Errorf("search of index files failed for batch with indexes from %d to %d: %w", results[i].startIndex, results[i].endIndex-1, results[i].err)
} }
if results[i].numOIDs < searchBatchSize { if results[i].numOIDs < searchBatchSize {
emptyBatchFound = true emptyBatchFound = true