Merge pull request #191 from anyproto/fix-push-many-limit

deff7 · web-flow · commit 403b413a16b3 · 2025-12-05T19:06:28.000+01:00
BlockPushMany: Fix bytes limit
diff --git a/filenode/rpchandler.go b/filenode/rpchandler.go
@@ -13,8 +13,9 @@ import (
 )
 
 const (
-	cidSizeLimit     = 4 << 20 // 4 Mb
-	fileInfoReqLimit = 1000
+	blockPushManyTotalLimit = 20 << 20 // 20 Mb
+	cidSizeLimit            = 4 << 20  // 4 Mb
+	fileInfoReqLimit        = 1000
 )
 
 type rpcHandler struct {
@@ -133,7 +134,7 @@ func (r rpcHandler) BlockPushMany(ctx context.Context, req *fileproto.BlockPushM
 				return nil, ErrWrongHash
 			}
 			dataSum += len(b.RawData())
-			if dataSum > fileInfoReqLimit {
+			if dataSum > blockPushManyTotalLimit {
 				return nil, fileprotoerr.ErrQuerySizeExceeded
 			}
 			bs = append(bs, b)

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,9 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`
`16`		`- cidSizeLimit = 4 << 20 // 4 Mb`
`17`		`- fileInfoReqLimit = 1000`
	`16`	`+ blockPushManyTotalLimit = 20 << 20 // 20 Mb`
	`17`	`+ cidSizeLimit = 4 << 20 // 4 Mb`
	`18`	`+ fileInfoReqLimit = 1000`
`18`	`19`	`)`
`19`	`20`
`20`	`21`	`type rpcHandler struct {`
`@@ -133,7 +134,7 @@ func (r rpcHandler) BlockPushMany(ctx context.Context, req *fileproto.BlockPushM`
`133`	`134`	`return nil, ErrWrongHash`
`134`	`135`	`}`
`135`	`136`	`dataSum += len(b.RawData())`
`136`		`- if dataSum > fileInfoReqLimit {`
	`137`	`+ if dataSum > blockPushManyTotalLimit {`
`137`	`138`	`return nil, fileprotoerr.ErrQuerySizeExceeded`
`138`	`139`	`}`
`139`	`140`	`bs = append(bs, b)`