Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

don't enforce maxuploadtarget's disconnect for whitelisted peers #6984

Merged
merged 3 commits into from
Nov 14, 2015
Merged

don't enforce maxuploadtarget's disconnect for whitelisted peers #6984

merged 3 commits into from
Nov 14, 2015

Conversation

jonasschnelli
Copy link
Contributor

No description provided.

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch 2 times, most recently from bba177b to 3fbe493 Compare November 11, 2015 09:15
sipa
sipa reviewed Nov 11, 2015
View reviewed changes
src/main.cpp
static const int nOneWeek = 7 * 24 * 60 * 60; // assume > 1 week = historical
if (send && CNode::OutboundTargetReached(true) && ( ((pindexBestHeader != NULL) && (pindexBestHeader->GetBlockTime() - mi->second->GetBlockTime() > nOneWeek)) || inv.type == MSG_FILTERED_BLOCK) )
if (send && CNode::OutboundTargetReached(true) && ( ((pindexBestHeader != NULL) && (pindexBestHeader->GetBlockTime() - mi->second->GetBlockTime() > nOneWeek)) || inv.type == MSG_FILTERED_BLOCK) && !pfrom->fWhitelisted )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary space before )

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True. Force-push removed.

@sipa
Copy link
Member

sipa commented Nov 11, 2015

utACK

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch from 3fbe493 to 4566e5b Compare November 11, 2015 09:43
@gmaxwell
Copy link
Contributor

utACK

@fanquake
Copy link
Member

utACK @jonasschnelli has documentation written, it just needs to be included here.

@laanwj laanwj added the P2P label Nov 11, 2015
@laanwj
Copy link
Member

laanwj commented Nov 11, 2015

Concept ACK

@instagibbs
Copy link
Member

utACK

sipa
sipa reviewed Nov 12, 2015
View reviewed changes
qa/rpc-tests/maxuploadtarget.py
NetworkThread().start() # Start up network handling in another thread
[x.wait_for_verack() for x in test_nodes]

#retrieve 20 blocks which should be enought to break the 1MB limit
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: enough

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Fixed.

@sipa
Copy link
Member

sipa commented Nov 12, 2015

utACK

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch from 4566e5b to 5a2984f Compare November 12, 2015 13:40
@instagibbs instagibbs mentioned this pull request Nov 12, 2015
Merged
maflcko
maflcko reviewed Nov 13, 2015
View reviewed changes
src/main.cpp
@@ -3856,8 +3856,9 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
}
}
// disconnect node in case we have reached the outbound limit for serving historical blocks
// never disconnect whitelisted nodes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this already mentioned in the release notes and/or documentation?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's more or less adequately explained by the documentation for whitelist.

Though the release note for maxupload target could mention it too.

@gmaxwell
Copy link
Contributor

Also tested, works good. (I gave a utACK above). Please update docs/release notes as you see fit.

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch from 5a2984f to 1aa57ac Compare November 13, 2015 20:12
@jonasschnelli
Copy link
Contributor Author

I have added a short documentation in the release-notes.md and in the reduce-traffic.md doc (feel free to overhaul). Also i smuggled in a rename from reducetraffic.md to reduce-traffic.md (which would be silly to do in a separated PR). All other doc filename use the same pattern.

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch from 1aa57ac to e495ed5 Compare November 14, 2015 07:43
@jonasschnelli
Copy link
Contributor Author

Thanks. Fixed.

@gmaxwell gmaxwell merged commit e495ed5 into bitcoin:master Nov 14, 2015
gmaxwell added a commit that referenced this pull request Nov 14, 2015
@gmaxwell
Merge pull request #6984
9ffc687 
e495ed5 add documentation for exluding whitelistes peer from maxuploadtarget (Jonas Schnelli)
5760749 [docs] rename reducetraffic.md to reduce-traffic.md (Jonas Schnelli)
d61fcff don't enforce maxuploadtargets disconnect for whitelisted peers (Jonas Schnelli)
@rebroad rebroad mentioned this pull request Aug 26, 2016
Closed
@str4d str4d mentioned this pull request Jul 14, 2017
Draft
@str4d str4d mentioned this pull request Dec 19, 2017
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Feb 18, 2021
@zkbot
Auto merge of #2816 - str4d:2074-maxuploadtarget, r=str4d
1d378b1 
Introduce -maxuploadtarget

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6622
- bitcoin/bitcoin#6987
- bitcoin/bitcoin#6958
- bitcoin/bitcoin#6984
- bitcoin/bitcoin#6999

Part of #2074.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
P2P
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jonasschnelli @sipa @gmaxwell @fanquake @laanwj @instagibbs @maflcko