More antiflood fixes #1861
Merged
More antiflood fixes #1861
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
Contributor
iulianpascalau
commented
Jun 3, 2020
iulianpascalau
commented
- added an out-of-specs flood preventer
- added antiflood debugger
- moved PeerID from p2p to core package
- replaced blackListHandler with peerBlackListHandler in antiflood package
- added the possibility to switch off the observer's antiflood system in system tests
- added antiflood debugger - moved PeerID from p2p to core package - replaced blackListHandler with peerBlackListHandler in antiflood package - added the possibility to switch off the observer's antiflood system in system tests
# Conflicts: # p2p/libp2p/networksharding/prioBitsSharder.go # p2p/libp2p/networksharding/prioBitsSharder_test.go
sasurobert
requested changes
Jun 3, 2020
iulianpascalau
added
type:bug
| ResetForTopic(topic string) | ||
| SetMaxMessagesForTopic(topic string, maxNum uint32) | ||
| SetDebugger(debugger process.AntifloodDebugger) error |
There was a problem hiding this comment.
👍 a good example for injection via methods.
AttachDebugger 🎆
There was a problem hiding this comment.
Yes, the injection via method was done because a debugger is not a critical component.
| @@ -85,6 +86,11 @@ updateNodeConfig() { | |||
| cp nodesSetup_edit.json nodesSetup.json | |||
| rm nodesSetup_edit.json | |||
|
|
|||
| if [ $OBSERVERS_ANTIFLOOD_DISABLE -eq 1 ] | |||
| then | |||
| sed -i '/\[Antiflood\]/,/\[Logger\]/ s/true/false/' config_observer.toml | |||
There was a problem hiding this comment.
Yup, sed stuff :(
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (af *p2pAntiflood) canProcessMessage(fp process.FloodPreventer, message p2p.MessageP2P, fromConnectedPeer p2p.PeerID) error { | ||
| func (af *p2pAntiflood) recordDebugEvent(pid core.PeerID, topic string, numRejected uint32, sizeRejected uint64, isBlacklisted bool) { |
debug/antiflood/debugger.go
Outdated
| mutCriticalArea sync.RWMutex | ||
| cache storage.Cacher | ||
| intervalAutoPrint time.Duration | ||
| printEventHandler func(data string) |
There was a problem hiding this comment.
Naming a bit unfortunate (because we use the suffix handler with other meaning usually) - could be printEventFunc, eventPrinter.
There was a problem hiding this comment.
printEventFunc shall be
|
|
||
| assert.Equal(t, 1, d.cache.Len()) | ||
| ev := d.GetData([]byte(string(pid) + topic)) | ||
| require.NotNil(t, ev) |
andreibancioiu
previously approved these changes
Jun 5, 2020
sasurobert
previously approved these changes
Jun 5, 2020
# Conflicts: # dataRetriever/resolvers/topicResolverSender/export_test.go
- fixed mcl seldom failing test: Test_ScalarMulPkOK
iulianpascalau
dismissed stale reviews from sasurobert and andreibancioiu
via
928a23e
…rond-go into antiflood-fixes
# Conflicts: # factory/networkComponents_test.go # p2p/libp2p/netMessenger.go
AdoAdoAdo
reviewed
Jun 8, 2020
p2p/mock/reconnecterStub.go
Outdated
| return rs.ReconnectToNetworkCalled() | ||
| } | ||
|
|
||
| return make(chan struct{}, 1000) |
There was a problem hiding this comment.
made unbuffered
AdoAdoAdo
approved these changes
Jun 8, 2020
andreibancioiu
approved these changes
Jun 8, 2020
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.