From 87bbff983148c62d482e5b9e1c973c125285ac42 Mon Sep 17 00:00:00 2001 From: Ekaterina Pavlova Date: Fri, 18 Oct 2024 13:21:21 +0300 Subject: [PATCH] cli: adjust error of `upload-bin` command Miscalculation leads to negative values in errors: ``` 2024-10-17 11:26:56.790 failed to fetch the latest missing block index from container: search of index files failed for batch with indexes from -260000 to -250000: error during object IDs iteration: context deadline exceeded ``` Close #3621 Signed-off-by: Ekaterina Pavlova --- cli/util/uploader.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cli/util/uploader.go b/cli/util/uploader.go index 8f2950251..d7441fd41 100644 --- a/cli/util/uploader.go +++ b/cli/util/uploader.go @@ -205,6 +205,7 @@ func retry(action func() error) error { type searchResult struct { startIndex int + endIndex int numOIDs int 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) 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) } wg.Wait() for i := len(results) - 1; i >= 0; i-- { 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 { emptyBatchFound = true