Skip to content

Commit 62be3bc

Browse files
Merge #6984: fix: correctly detect and skip disconnecting pending quorum masternodes
0fce90a fix: correctly detect and skip disconnecting pending quorum masternodes (UdjinM6) Pull request description: ## Issue being fixed or feature implemented Similar to #6983, incorrect refactoring in #6912 ## What was done? Correctly detect and skip disconnecting pending quorum masternodes ## How Has This Been Tested? Run tests ## Breaking Changes n/a ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: kwvg: utACK 0fce90a Tree-SHA512: b92b2bf0d08bc814835a29333895c1328b0a12c6b7d612e980b59895d80f6c17ed9c228f65580cb10c0e1f1fd66304093a8224761525302782a3f19bae2a63f3
2 parents 67414b4 + 0fce90a commit 62be3bc

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/net.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3404,9 +3404,9 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
34043404
continue;
34053405
}
34063406
const auto addr2 = dmn->pdmnState->netInfo->GetPrimary();
3407-
CNode* pnode = FindNodeMutable(addr2);
3408-
if (pnode && pnode->m_masternode_connection) {
3409-
// node is masternode, skip it
3407+
CNode* pnode = FindNodeMutable(addr2, /*fExcludeDisconnecting=*/false);
3408+
if (pnode && (pnode->m_masternode_connection || pnode->fDisconnect)) {
3409+
// node is either a masternode or disconnecting, skip it
34103410
continue;
34113411
}
34123412
if (connectedNodes.count(addr2)) {

0 commit comments

Comments
 (0)