Skip to content

Drop trigger objects when triggers are deleted or failed to be created #2098

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
merged 4 commits into from
Jun 6, 2018
Merged

Drop trigger objects when triggers are deleted or failed to be created #2098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68d4391
Mark an object for deletion when the corresponding trigger is deleted
UdjinM6 Jun 5, 2018
dec34b5
Mark objects for deletion if creation of corresponding triggers failed
UdjinM6 Jun 5, 2018
cce1711
NULL -> nullptr
UdjinM6 Jun 6, 2018
82bda87
Make sure pObj is not null
UdjinM6 Jun 6, 2018
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
40 changes: 20 additions & 20 deletions src/governance-classes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,35 +156,27 @@ void CGovernanceTriggerManager::CleanAndRemove()
DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: Start" << std::endl; );
AssertLockHeld(governance.cs);

// LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
for(trigger_m_it it = mapTrigger.begin(); it != mapTrigger.end(); ++it) {
//int nNewStatus = -1;
CGovernanceObject* pObj = governance.FindGovernanceObject((*it).first);
if(!pObj) {
continue;
}
CSuperblock_sptr& pSuperblock = it->second;
if(!pSuperblock) {
continue;
}
// IF THIS ISN'T A TRIGGER, WHY ARE WE HERE?
if(pObj->GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) {
pSuperblock->SetStatus(SEEN_OBJECT_ERROR_INVALID);
}
}

// Remove triggers that are invalid or expired
DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: mapTrigger.size() = " << mapTrigger.size() << std::endl; );
LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- mapTrigger.size() = %d\n", mapTrigger.size());

trigger_m_it it = mapTrigger.begin();
while(it != mapTrigger.end()) {
bool remove = false;
CGovernanceObject* pObj = nullptr;
CSuperblock_sptr& pSuperblock = it->second;
if(!pSuperblock) {
DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: NULL superblock marked for removal" << std::endl; );
LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- NULL superblock marked for removal\n");
remove = true;
} else {
pObj = governance.FindGovernanceObject(it->first);
if(!pObj || pObj->GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) {
DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: Unknown or non-trigger superblock" << std::endl; );
LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- Unknown or non-trigger superblock\n");
pSuperblock->SetStatus(SEEN_OBJECT_ERROR_INVALID);
}

DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: superblock status = " << pSuperblock->GetStatus() << std::endl; );
LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- superblock status = %d\n", pSuperblock->GetStatus());
switch(pSuperblock->GetStatus()) {
Expand All @@ -201,19 +193,27 @@ void CGovernanceTriggerManager::CleanAndRemove()
break;
}
}
LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- %smarked for removal\n", remove ? "" : "NOT ");

if(remove) {
DBG(
std::string strDataAsPlainString = "NULL";
CGovernanceObject* pgovobj = pSuperblock->GetGovernanceObject();
if(pgovobj) {
strDataAsPlainString = pgovobj->GetDataAsPlainString();
if(pObj) {
strDataAsPlainString = pObj->GetDataAsPlainString();
}
std::cout << "CGovernanceTriggerManager::CleanAndRemove: Removing object: "
<< strDataAsPlainString
<< std::endl;
);
LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- Removing trigger object\n");
// mark corresponding object for deletion
if (pObj) {
pObj->fCachedDelete = true;
if (pObj->nDeletionTime == 0) {
pObj->nDeletionTime = GetAdjustedTime();
}
}
// delete the trigger
mapTrigger.erase(it++);
}
else {
Expand Down
38 changes: 24 additions & 14 deletions src/governance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,18 +316,17 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman
return;
}

LogPrint("gobject", "CGovernanceManager::AddGovernanceObject -- Adding object: hash = %s, type = %d\n", nHash.ToString(), govobj.GetObjectType());

// INSERT INTO OUR GOVERNANCE OBJECT MEMORY
// IF WE HAVE THIS OBJECT ALREADY, WE DON'T WANT ANOTHER COPY
auto objpair = mapObjects.emplace(nHash, govobj);

if(mapObjects.count(nHash)) {
if(!objpair.second) {
LogPrintf("CGovernanceManager::AddGovernanceObject -- already have governance object %s\n", nHash.ToString());
return;
}

LogPrint("gobject", "CGovernanceManager::AddGovernanceObject -- Adding object: hash = %s, type = %d\n", nHash.ToString(), govobj.GetObjectType());

// INSERT INTO OUR GOVERNANCE OBJECT MEMORY
mapObjects.insert(std::make_pair(nHash, govobj));

// SHOULD WE ADD THIS OBJECT TO ANY OTHER MANANGERS?

DBG( std::cout << "CGovernanceManager::AddGovernanceObject Before trigger block, GetDataAsPlainString = "
Expand All @@ -337,7 +336,15 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman

if (govobj.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
DBG( std::cout << "CGovernanceManager::AddGovernanceObject Before AddNewTrigger" << std::endl; );
triggerman.AddNewTrigger(nHash);
if (!triggerman.AddNewTrigger(nHash)) {
LogPrint("gobject", "CGovernanceManager::AddGovernanceObject -- undo adding invalid trigger object: hash = %s\n", nHash.ToString());
CGovernanceObject& objref = objpair.first->second;
objref.fCachedDelete = true;
if (objref.nDeletionTime == 0) {
objref.nDeletionTime = GetAdjustedTime();
}
return;
}
DBG( std::cout << "CGovernanceManager::AddGovernanceObject After AddNewTrigger" << std::endl; );
}

Expand Down Expand Up @@ -376,13 +383,10 @@ void CGovernanceManager::UpdateCachesAndClean()

ScopedLockBool guard(cs, fRateChecksEnabled, false);

// UPDATE CACHE FOR EACH OBJECT THAT IS FLAGGED DIRTYCACHE=TRUE

object_m_it it = mapObjects.begin();

// Clean up any expired or invalid triggers
triggerman.CleanAndRemove();

object_m_it it = mapObjects.begin();
int64_t nNow = GetAdjustedTime();

while(it != mapObjects.end())
Expand Down Expand Up @@ -445,6 +449,7 @@ void CGovernanceManager::UpdateCachesAndClean()
mapErasedGovernanceObjects.insert(std::make_pair(nHash, nTimeExpired));
mapObjects.erase(it++);
} else {
// NOTE: triggers are handled via triggerman
// DO NOT USE THIS UNTIL MAY, 2018 on mainnet
if ((GetAdjustedTime() >= 1526423380 || Params().NetworkIDString() != CBaseChainParams::MAIN) && pObj->GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
CProposalValidator validator(pObj->GetDataAsHexString());
Expand Down Expand Up @@ -1197,14 +1202,19 @@ void CGovernanceManager::AddCachedTriggers()
{
LOCK(cs);

for(object_m_it it = mapObjects.begin(); it != mapObjects.end(); ++it) {
CGovernanceObject& govobj = it->second;
for (auto& objpair : mapObjects) {
CGovernanceObject& govobj = objpair.second;

if(govobj.nObjectType != GOVERNANCE_OBJECT_TRIGGER) {
continue;
}

triggerman.AddNewTrigger(govobj.GetHash());
if (!triggerman.AddNewTrigger(govobj.GetHash())) {
govobj.fCachedDelete = true;
if (govobj.nDeletionTime == 0) {
govobj.nDeletionTime = GetAdjustedTime();
}
}
}
}

Expand Down