txnsync: Use dynamic maxEncodedTransactionGroups #3168
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
txnsync/service.go
Outdated
| @@ -51,6 +51,13 @@ func MakeTransactionSyncService(log logging.Logger, conn NodeConnector, isRelay | |||
| } | |||
| s.state.service = s | |||
| s.state.xorBuilder.MaxIterations = 10 | |||
| if cfg.TxPoolSize > maxEncodedTransactionGroups { | |||
There was a problem hiding this comment.
This looks correct, but think it would be cleaner if you'll move all that logic into a single method which would be called by both init() as well as from here.
There was a problem hiding this comment.
init methods are called when the package is loaded. In this case, instead of initializing the global variables where they are declared, call
func init() {
setTransactionSyncVariables(config.GetDefaultLocal())
}
...
func setTransactionSyncVariables(cfg config.Local) {
if cfg.TxPoolSize < maxEncodedTransactionGroups {
return
}
maxEncodedTransactionGroups = cfg.TxPoolSize
maxEncodedTransactionGroupEntries = cfg.TxPoolSize
maxBitmaskSize = (maxEncodedTransactionGroupEntries+7)/8 + 1
maxSignatureBytes = maxEncodedTransactionGroupEntries * len(crypto.Signature{})
maxAddressBytes = maxEncodedTransactionGroupEntries * crypto.DigestSize
maxBloomFilterSize = cfg.TxPoolSize * 5 // 32 bit xor uses slightly more than 4 bytes/element.
maxEncodedTransactionGroupBytes = cfg.TxPoolSize * 10000 // assume each transaction takes 10KB, as a worst-case-scenario for bounding purposes only.
}
Codecov Report
@@ Coverage Diff @@
## master #3168 +/- ##
==========================================
- Coverage 43.77% 43.77% -0.01%
==========================================
Files 391 391
Lines 86880 86891 +11
==========================================
- Hits 38036 38033 -3
- Misses 42810 42820 +10
- Partials 6034 6038 +4
Continue to review full report at Codecov.
|
tsachiherman
changed the title
tsachiherman
approved these changes
Oct 29, 2021
tsachiherman
added a commit
to tsachiherman/go-algorand
that referenced
this pull request
Nov 2, 2021
…)" This reverts commit 21c752e.
ghost
pushed a commit
to nicholasguo/go-algorand
that referenced
this pull request
Nov 18, 2021
Change constants in the txnsync around message size limits into variables based on maxTxPoolSize. This will allow for support of larger message sizes when dealing with larger load. Reran existing tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Change constants in the txnsync around message size limits into variables based on maxTxPoolSize. This will allow for support of larger message sizes when dealing with larger load.
Test Plan
Reran existing tests