net: fix maxuploadtarget setting #8707
Merged
Conversation
This file contains hidden or 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
|
utACK 86ce4ec |
| @@ -72,6 +72,8 @@ static const size_t SETASKFOR_MAX_SZ = 2 * MAX_INV_SZ; | |||
| static const unsigned int DEFAULT_MAX_PEER_CONNECTIONS = 125; | |||
| /** The default for -maxuploadtarget. 0 = Unlimited */ | |||
| static const uint64_t DEFAULT_MAX_UPLOAD_TARGET = 0; | |||
| /** The default for -maxuploadtarget. 0 = Unlimited */ | |||
There was a problem hiding this comment.
Whoops, c/p and forgot to actually fill it in. Will fix.
|
Could get affected/obsolete by #8712 |
|
Right, needs a rebase after #8712 probably. |
|
Roger, will rebase after merge. |
| @@ -2362,11 +2363,7 @@ void CConnman::RecordBytesSent(uint64_t bytes) | |||
| void CConnman::SetMaxOutboundTarget(uint64_t limit) | |||
| { | |||
| LOCK(cs_totalBytesSent); | |||
| uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE; | |||
There was a problem hiding this comment.
Needs rebase to solve silent merge conflict.
This was broken by 63cafa6. Note that while this fixes the settings, it doesn't fix the actual usage of -maxuploadtarget completely, as there is currently a bug in the nOptimisticBytesWritten accounting that causes a delayed response if the target is reached. That bug will be addressed separately.
86ce4ec to
f3552da
Compare
|
Rebased after #8712 and fixed the comment. |
|
Concept ACK. Can confirm that this together with #8708 fixes the test failure. |
laanwj
approved these changes
Sep 19, 2016
laanwj
added a commit
that referenced
this pull request
Sep 19, 2016
f3552da net: fix maxuploadtarget setting (Cory Fields)
codablock
pushed a commit
to codablock/dash
that referenced
this pull request
Jan 11, 2018
f3552da net: fix maxuploadtarget setting (Cory Fields)
andvgal
pushed a commit
to energicryptocurrency/gen2-energi
that referenced
this pull request
Jan 6, 2019
f3552da net: fix maxuploadtarget setting (Cory Fields)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This was broken by 63cafa6.
Note that while this fixes the settings, it doesn't fix the actual usage of
-maxuploadtarget completely, as there is currently a bug in the
nOptimisticBytesWritten accounting that causes a delayed response if the target
is reached. That bug will be addressed separately.
Thanks to @morcos for reporting.