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

cli: refactor errors and comments in upload-bin

Browse source 
Signed-off-by: Ekaterina Pavlova <ekt@morphbits.io>
This commit is contained in:
Ekaterina Pavlova 2024-10-31 18:13:35 +03:00
parent 6a93f70728
commit 365bbe08ed
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cli/util/uploader.go
View file

@ -110,6 +110,7 @@ func uploadBin(ctx *cli.Context) error {
return cli.Exit(fmt.Errorf("failed to get network info: %w", err), 1) return cli.Exit(fmt.Errorf("failed to get network info: %w", err), 1)
} }
homomorphicHashingDisabled := net.HomomorphicHashingDisabled() homomorphicHashingDisabled := net.HomomorphicHashingDisabled()
var containerObj container.Container var containerObj container.Container
err = retry(func() error { err = retry(func() error {
containerObj, err = p.ContainerGet(ctx.Context, containerID, client.PrmContainerGet{}) containerObj, err = p.ContainerGet(ctx.Context, containerID, client.PrmContainerGet{})
@ -126,7 +127,7 @@ func uploadBin(ctx *cli.Context) error {
} }
magic := strconv.Itoa(int(v.Protocol.Network)) magic := strconv.Itoa(int(v.Protocol.Network))
if containerMagic != magic { if containerMagic != magic {
return cli.Exit(fmt.Sprintf("Container magic %s does not match the network magic %s", containerMagic, magic), 1) return cli.Exit(fmt.Sprintf("container magic %s does not match the network magic %s", containerMagic, magic), 1)
} }
currentBlockHeight, err := rpc.GetBlockCount() currentBlockHeight, err := rpc.GetBlockCount()
@ -148,9 +149,9 @@ func uploadBin(ctx *cli.Context) error {
} }
} }
err = updateIndexFiles(ctx, p, containerID, *acc, signer, uint(currentBlockHeight), attr, homomorphicHashingDisabled, maxParallelSearches) err = uploadIndexFiles(ctx, p, containerID, acc, signer, uint(currentBlockHeight), attr, homomorphicHashingDisabled, maxParallelSearches)
if err != nil { if err != nil {
return cli.Exit(fmt.Errorf("failed to update index files after upload: %w", err), 1) return cli.Exit(fmt.Errorf("failed to upload index files: %w", err), 1)
} }
return nil return nil
} }
@ -179,8 +180,9 @@ type searchResult struct {
err error err error
} }
// fetchLatestMissingBlockIndex searches the container for the last full block batch, // fetchLatestMissingBlockIndex searches the container for the latest full batch of blocks
// starting from the currentHeight and going backwards. // starting from the currentHeight and going backwards. It returns the index of first block
// in the next batch.
func fetchLatestMissingBlockIndex(ctx context.Context, p *pool.Pool, containerID cid.ID, priv *keys.PrivateKey, attributeKey string, currentHeight int, maxParallelSearches int) (int, error) { func fetchLatestMissingBlockIndex(ctx context.Context, p *pool.Pool, containerID cid.ID, priv *keys.PrivateKey, attributeKey string, currentHeight int, maxParallelSearches int) (int, error) {
var ( var (
wg sync.WaitGroup wg sync.WaitGroup
@ -225,7 +227,7 @@ func fetchLatestMissingBlockIndex(ctx context.Context, p *pool.Pool, containerID
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", results[i].startIndex, results[i].endIndex-1, results[i].err) return 0, fmt.Errorf("blocks search 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
@ -323,11 +325,11 @@ func uploadBlocks(ctx *cli.Context, p *pool.Pool, rpc *rpcclient.Client, signer
return nil return nil
} }
// updateIndexFiles updates the index files in the container. // uploadIndexFiles uploads missing index files to the container.
func updateIndexFiles(ctx *cli.Context, p *pool.Pool, containerID cid.ID, account wallet.Account, signer user.Signer, currentHeight uint, blockAttributeKey string, homomorphicHashingDisabled bool, maxParallelSearches int) error { func uploadIndexFiles(ctx *cli.Context, p *pool.Pool, containerID cid.ID, account *wallet.Account, signer user.Signer, currentHeight uint, blockAttributeKey string, homomorphicHashingDisabled bool, maxParallelSearches int) error {
attributeKey := ctx.String("index-attribute") attributeKey := ctx.String("index-attribute")
indexFileSize := ctx.Uint("index-file-size") indexFileSize := ctx.Uint("index-file-size")
fmt.Fprintln(ctx.App.Writer, "Updating index files...") fmt.Fprintln(ctx.App.Writer, "Uploading index files...")
prm := client.PrmObjectSearch{} prm := client.PrmObjectSearch{}
filters := object.NewSearchFilters() filters := object.NewSearchFilters()
@ -341,12 +343,11 @@ func updateIndexFiles(ctx *cli.Context, p *pool.Pool, containerID cid.ID, accoun
return errSearchIndex return errSearchIndex
}) })
if errSearch != nil { if errSearch != nil {
return fmt.Errorf("search of index files failed: %w", errSearch) return fmt.Errorf("index files search failed: %w", errSearch)
} }
existingIndexCount := uint(len(objectIDs)) existingIndexCount := uint(len(objectIDs))
expectedIndexCount := currentHeight / indexFileSize expectedIndexCount := currentHeight / indexFileSize
if existingIndexCount >= expectedIndexCount { if existingIndexCount >= expectedIndexCount {
fmt.Fprintf(ctx.App.Writer, "Index files are up to date. Existing: %d, expected: %d\n", existingIndexCount, expectedIndexCount) fmt.Fprintf(ctx.App.Writer, "Index files are up to date. Existing: %d, expected: %d\n", existingIndexCount, expectedIndexCount)
return nil return nil
@ -439,12 +440,11 @@ func updateIndexFiles(ctx *cli.Context, p *pool.Pool, containerID cid.ID, accoun
} }
} }
} }
// Check if there are any empty oids in the created index file. // Check if there are empty OIDs in the generated index file. If it happens at
// This could happen if object payload is empty -> // this stage, then there's a bug in the code.
// attribute is not set correctly -> empty oid is added to the index file.
for k := 0; k < len(buffer); k += oidSize { for k := 0; k < len(buffer); k += oidSize {
if slices.Compare(buffer[k:k+oidSize], emptyOid) == 0 { if slices.Compare(buffer[k:k+oidSize], emptyOid) == 0 {
return fmt.Errorf("empty oid found in index file %d at position %d (block index %d)", i, k/oidSize, i+uint(k/oidSize)) return fmt.Errorf("empty OID found in index file %d at position %d (block index %d)", i, k/oidSize, i+uint(k/oidSize))
} }
} }
attrs := []object.Attribute{ attrs := []object.Attribute{
@ -459,11 +459,12 @@ func updateIndexFiles(ctx *cli.Context, p *pool.Pool, containerID cid.ID, accoun
} }
fmt.Fprintf(ctx.App.Writer, "Uploaded index file %d\n", i) fmt.Fprintf(ctx.App.Writer, "Uploaded index file %d\n", i)
} }
return nil return nil
} }
// uploadObj uploads the block to the container using the pool. // uploadObj uploads object to the container using provided settings.
func uploadObj(ctx context.Context, p *pool.Pool, signer user.Signer, owner util.Uint160, containerID cid.ID, objData []byte, attrs []object.Attribute, HomomorphicHashingDisabled bool) error { func uploadObj(ctx context.Context, p *pool.Pool, signer user.Signer, owner util.Uint160, containerID cid.ID, objData []byte, attrs []object.Attribute, homomorphicHashingDisabled bool) error {
var ( var (
ownerID user.ID ownerID user.ID
hdr object.Object hdr object.Object
@ -482,7 +483,7 @@ func uploadObj(ctx context.Context, p *pool.Pool, signer user.Signer, owner util
hdr.SetCreationEpoch(1) hdr.SetCreationEpoch(1)
v.SetMajor(1) v.SetMajor(1)
hdr.SetVersion(v) hdr.SetVersion(v)
if !HomomorphicHashingDisabled { if !homomorphicHashingDisabled {
checksum.Calculate(&chHomomorphic, checksum.TZ, objData) checksum.Calculate(&chHomomorphic, checksum.TZ, objData)
hdr.SetPayloadHomomorphicHash(chHomomorphic) hdr.SetPayloadHomomorphicHash(chHomomorphic)
} }