Fix AddRef() usage #924
Merged
Fix AddRef() usage #924
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
Using AddRef() in ConnectNode() for existing connections doesn't feel right considering how refs are released in ThreadSocketHandler(). I guess this could be the reason that sometimes refs stay >0 no matter what and nodes stuck in vNodesDisconnected forever which means that node never get deleted and FinalizeNode signal is never fired which in its turn means that for example mapBlocksInFlight can't be cleaned properly and then blocks stuck. This commit should solve the issue by: - removing AddRef() for existing connections - adding AddRef() in CNode's constructor using the same conditions as in ThreadSocketHandler() - addding AddRef() in ConnectNode() and Release() in ThreadSocketHandler() for mixing nodes - removing explicit calls to Release() (back to `pnode->fDisconnect = true` in `CMasternodeMan::ProcessMasternodeConnections`)
| @@ -526,11 +526,10 @@ void CMasternodeMan::ProcessMasternodeConnections() | |||
|
|
|||
| LOCK(cs_vNodes); | |||
| BOOST_FOREACH(CNode* pnode, vNodes) { | |||
| if(pnode->fDarkSendMaster){ | |||
| if(pnode->fDarkSendMaster) { | |||
There was a problem hiding this comment.
Shouldnt it be "privatesend" while you are at it? :-)
There was a problem hiding this comment.
Good point 👍 Actually shouldn't mention any specifics at all and usage was not described correctly imo (was "where" to use rather then "when"/"why") - fixed var names and comments.
|
utACK |
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.
Using
AddRef()inConnectNode()for existing connections doesn't feel right considering how refs are released inThreadSocketHandler(). I guess this could be the reason that sometimes refs stay >0 no matter what and nodes stuck invNodesDisconnectedforever which means that node never get deleted andFinalizeNodesignal is never fired which in its turn means that for examplemapBlocksInFlightcan't be cleaned properly and then blocks stuck.This commit should solve the issue by:
AddRef()for existing connectionsAddRef()inCNode's constructor using the same conditions as inThreadSocketHandler()AddRef()inConnectNode()andRelease()inThreadSocketHandler()for mixing nodesRelease()(back topnode->fDisconnect = trueinCMasternodeMan::ProcessMasternodeConnections)