Skip to content

fix: resolve potential deadlock #5138

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

Merged
PastaPastaPasta merged 3 commits into from
Jan 10, 2023
Merged

fix: resolve potential deadlock #5138

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
414a934
fix: resolve potential deadlock
UdjinM6 Jan 5, 2023
a923ada
fix: another one
UdjinM6 Jan 5, 2023
631e228
fix: yet another one
UdjinM6 Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/governance/governance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,9 @@ void CGovernanceManager::SyncSingleObjVotes(CNode& peer, const uint256& nProp, c

LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- syncing single object to peer=%d, nProp = %s\n", __func__, peer.GetId(), nProp.ToString());

LOCK(cs);
// TODO: drop cs_main here when v19 activation is buried
// and CGovernanceVote::CheckSignature no longer needs to use ::ChainActive()
LOCK2(cs_main, cs);

// single valid object and its valid votes
auto it = mapObjects.find(nProp);
Expand Down Expand Up @@ -775,6 +777,9 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo

bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
{
// TODO: drop cs_main here when v19 activation is buried
// and CGovernanceVote::CheckSignature no longer needs to use ::ChainActive()
LOCK(cs_main);
ENTER_CRITICAL_SECTION(cs)
uint256 nHashVote = vote.GetHash();
uint256 nHashGovobj = vote.GetParentHash();
Expand Down Expand Up @@ -1238,7 +1243,9 @@ void CGovernanceManager::RemoveInvalidVotes()
return;
}

LOCK(cs);
// TODO: drop cs_main here when v19 activation is buried
// and CGovernanceVote::CheckSignature no longer needs to use ::ChainActive()
LOCK2(cs_main, cs);

auto curMNList = deterministicMNManager->GetListAtChainTip();
auto diff = lastMNListForVotingKeys->BuildDiff(curMNList);
Expand Down