net: fix maxuploadtarget setting #8707

1. 
   theuni commented at 0:47 am on September 13, 2016: member

   This was broken by 63cafa6329e1a.

   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.

2. jonasschnelli added the label P2P on Sep 13, 2016
3. 
   jonasschnelli commented at 6:39 am on September 13, 2016: contributor

   utACK https://github.com/bitcoin/bitcoin/pull/8707/commits/86ce4ec7f6cea9a3ee7ce02c686ff3985c36083f
4. in src/net.h: in 86ce4ec7f6 outdated

   71@@ -72,6 +72,8 @@ static const size_t SETASKFOR_MAX_SZ = 2 * MAX_INV_SZ;
   72 static const unsigned int DEFAULT_MAX_PEER_CONNECTIONS = 125;
   73 /** The default for -maxuploadtarget. 0 = Unlimited */
   74 static const uint64_t DEFAULT_MAX_UPLOAD_TARGET = 0;
   75+/** The default for -maxuploadtarget. 0 = Unlimited */
   

   ---

   ---

   

   MarcoFalke commented at 10:06 am on September 13, 2016:

   I think the comment is wrong?

   ---

   

   theuni commented at 3:56 pm on September 13, 2016:

   Whoops, c/p and forgot to actually fill it in. Will fix.
5. 
   jonasschnelli commented at 4:14 pm on September 13, 2016: contributor

   Could get affected/obsolete by #8712
6. 
   MarcoFalke commented at 4:24 pm on September 13, 2016: member

   Right, needs a rebase after #8712 probably.
7. 
   theuni commented at 5:47 pm on September 13, 2016: member

   Roger, will rebase after merge.
8. net: fix maxuploadtarget setting

   This was broken by 63cafa6329e1a.
   
   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.

   f3552da813
9. in src/net.cpp: in 86ce4ec7f6 outdated

   2362@@ -2362,11 +2363,7 @@ void CConnman::RecordBytesSent(uint64_t bytes)
   2363 void CConnman::SetMaxOutboundTarget(uint64_t limit)
   2364 {
   2365     LOCK(cs_totalBytesSent);
   2366-    uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE;
   

   ---

   ---

   

   MarcoFalke commented at 9:45 am on September 14, 2016:

   Needs rebase to solve silent merge conflict.
10. theuni force-pushed on Sep 14, 2016
11. 
    theuni commented at 5:16 pm on September 14, 2016: member

    Rebased after #8712 and fixed the comment.
12. 
    MarcoFalke commented at 7:29 pm on September 16, 2016: member

    Concept ACK. Can confirm that this together with #8708 fixes the test failure.
13. laanwj approved
14. 
    laanwj commented at 2:45 pm on September 19, 2016: member

    utACK https://github.com/bitcoin/bitcoin/pull/8707/commits/f3552da81393a8e78ce3e2afed0b9c9d1ff5cee0
15. laanwj merged this on Sep 19, 2016
16. laanwj closed this on Sep 19, 2016

    ---

17. laanwj referenced this in commit f07424a671 on Sep 19, 2016
18. codablock referenced this in commit 7b69da7941 on Sep 19, 2017
19. codablock referenced this in commit af5d18ad5c on Jan 11, 2018
20. andvgal referenced this in commit 7104138210 on Jan 6, 2019
21. MarcoFalke locked this on Sep 8, 2021

Contributors
theuni jonasschnelli MarcoFalke laanwj

Labels
P2P