[trivial] Cleanup maxuploadtarget (doc & log) #6958

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:MarcoFalke-2015-maxupload changing 5 files +27 −5

MarcoFalke commented at 7:11 AM on November 6, 2015: member

@jonasschnelli this fixes #6890.
in qa/rpc-tests/maxuploadtarget.py:None in 5a6d14dca7 outdated
```
 191 | @@ -192,7 +192,8 @@ def run_test(self):
 192 |          getdata_request.inv.append(CInv(2, big_old_block))
 193 |  
 194 |          max_bytes_per_day = 200*1024*1024
 195 | -        max_bytes_available = max_bytes_per_day - 144*1000000
 196 | +        daily_buffer = 144 * 1000000 # 144 * MAX_BLOCK_SIZE
```
jonasschnelli commented at 7:13 AM on November 6, 2015:

Hmm.... i think either we take in the MAX_BLOCK_SIZE constant (controversial) or we drop the comment.

MarcoFalke commented at 7:17 AM on November 6, 2015:

Is this exposed via rpc? I always like to do grep -r 'CONSTANT' bitcoin/ when touching a constant to see it's usage.
jonasschnelli commented at 7:15 AM on November 6, 2015: contributor

utACK. Thanks!

I think we should extend the documentation about -maxuploadtarget. How it actually works under the hood (short, 1-2 sentence). I can do this after this has been merged.
MarcoFalke force-pushed on Nov 10, 2015
MarcoFalke force-pushed on Nov 10, 2015
jonasschnelli commented at 12:49 PM on November 10, 2015: contributor
Two commits that could make sense for this PR (2nd one maybe independent):
- db504eb6ca6c85db13bb7168c2c5d48840bb97d6 ([doc] extend -maxuploadtarget release notes)
- f6b96ce09ec827bb9be0fd926b199009dd08bfd4 ([doc] add documentation how to reduce traffic)
Both are written in my swenglish (swiss english). Feel free (or obligated) to correct and rewrite everything.
laanwj added the label Docs and Output on Nov 10, 2015
MarcoFalke force-pushed on Nov 11, 2015

in src/net.cpp:None in 3fb48ffd2a outdated

2107 | @@ -2108,8 +2108,8 @@ void CNode::SetMaxOutboundTarget(uint64_t limit)
2108 |      uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SIZE;
2109 |      nMaxOutboundLimit = limit;
2110 |  
2111 | -    if (limit < recommendedMinimum)
2112 | -        LogPrintf("Max outbound target is very small (%s) and will be overshot. Recommended minimum is %s\n.", nMaxOutboundLimit, recommendedMinimum);
2113 | +    if (limit > 0 && limit < recommendedMinimum)

jonasschnelli commented at 1:12 PM on November 11, 2015:

Nice catch. Thanks!

jonasschnelli commented at 1:12 PM on November 11, 2015: contributor

utACK
MarcoFalke commented at 1:49 PM on November 11, 2015: member

Looks ready to merge!?

in doc/release-notes.md:None in 3fb48ffd2a outdated

 163 | +serving historic blocks (blocks older than one week).
 164 | +Moreover, any SPV peer is disconnected when they request a filtered block.
 165 | +
 166 | +This option can be specified in MiB per day and is turned off by default
 167 | +(`-maxuploadtarget=0`).
 168 | +The recommended minimum is 144 * MAX_BLOCK_SIZE (currently 144MB) per day.

jtimon commented at 3:32 PM on November 11, 2015:

Maybe a link to https://github.com/jonasschnelli/bitcoin/blob/2015/11/doc_traffic/doc/reducetraffic.md (once it's merged) can be added here ? Something like "for more details on reducing traffic, see ...".

jtimon commented at 3:35 PM on November 11, 2015: contributor

utACK besides my little nit.

[net] Cleanup maxuploadtarget

* log: nMaxOutboundLimit is in bytes
* log: Hide misleading -maxuploadtarget=0 warning
* qa : Minor cleanup to maxuploadtarget rpc tests
* net: Use DEFAULT_MAX_UPLOAD_TARGET = 0

b27e81f115

MarcoFalke force-pushed on Nov 12, 2015
[doc] Add -maxuploadtarget release notes 9c3ee3bf77
MarcoFalke commented at 8:13 PM on November 12, 2015: member

@jtimon Done.
MarcoFalke force-pushed on Nov 12, 2015
jtimon commented at 8:17 PM on November 12, 2015: contributor

Great, re-utACK
laanwj merged this on Nov 13, 2015
laanwj closed this on Nov 13, 2015
laanwj referenced this in commit d2e987aa19 on Nov 13, 2015
MarcoFalke deleted the branch on Nov 14, 2015
zkbot referenced this in commit fd0d435f72 on Feb 18, 2021
zkbot referenced this in commit 1d378b1eb0 on Feb 18, 2021
DrahtBot locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#6890 Add -maxuploadtarget to 0.12 release-notes