TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 104 Pull requests 4 Projects Releases 2 Activity Actions

morph: Fix batch size in TraverseIterator() #1000

Merged
fyrchik merged 2 commits from fyrchik/frostfs-node:fix-iterator into master 2024-02-23 06:24:42 +00:00
Conversation 1 Commits 2 Files changed 2 +9 -4
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/frostfs-adm/internal/modules/morph/contract/dump_hashes.go
View file

@ -177,12 +177,12 @@ func dumpCustomZoneHashes(cmd *cobra.Command, nnsHash util.Uint160, zone string,
_ = inv.TerminateSession(sessionID) _ = inv.TerminateSession(sessionID)
}() }()
items, err := inv.TraverseIterator(sessionID, &iter, nnsMaxTokens) items, err := inv.TraverseIterator(sessionID, &iter, 0)
for err == nil && len(items) != 0 { for err == nil && len(items) != 0 {
for i := range items { for i := range items {
processItem(items[i]) processItem(items[i])
} }
items, err = inv.TraverseIterator(sessionID, &iter, nnsMaxTokens) items, err = inv.TraverseIterator(sessionID, &iter, 0)
} }
if err != nil { if err != nil {
return fmt.Errorf("error during NNS domains iteration: %w", err) return fmt.Errorf("error during NNS domains iteration: %w", err)

9
pkg/morph/client/client.go
View file

@ -260,8 +260,13 @@ func (c *Client) TestInvokeIterator(cb func(stackitem.Item) error, batchSize int
_ = c.rpcActor.TerminateSession(sid) _ = c.rpcActor.TerminateSession(sid)
}() }()
// Batch size for TraverseIterator() can restricted on the server-side.
traverseBatchSize := batchSize
if invoker.DefaultIteratorResultItems < traverseBatchSize {
traverseBatchSize = invoker.DefaultIteratorResultItems
}
for { for {
items, err := c.rpcActor.TraverseIterator(sid, &r, batchSize) items, err := c.rpcActor.TraverseIterator(sid, &r, traverseBatchSize)
if err != nil { if err != nil {
return err return err
} }
@ -271,7 +276,7 @@ func (c *Client) TestInvokeIterator(cb func(stackitem.Item) error, batchSize int
return err return err
} }
} }
if len(items) < batchSize { if len(items) < traverseBatchSize {
break break
} }
} }