Skip to content
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

Jump to bottom

scraper: Fix scraper deadlock and make activebeforesb dynamic (not require restart) #2358

Merged
merged 2 commits into from
Oct 11, 2021
Merged

scraper: Fix scraper deadlock and make activebeforesb dynamic (not require restart) #2358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fba5ab8
Adjust locking in ScraperGetSuperblockContract to avoid a deadlock on…
jamescowens Oct 4, 2021
524e07e
Allow scraper activebeforesb to be changed from network protocol with…
jamescowens Oct 4, 2021
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
47 changes: 27 additions & 20 deletions src/gridcoin/scraper/scraper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,10 +1575,17 @@ void Scraper(bool bSingleShot)
}

sbage = SuperblockAge();
int64_t loop_sleep = scraper_sleep();

_log(logattribute::INFO, "Scraper", "Superblock not needed. age=" + ToString(sbage));
_log(logattribute::INFO, "Scraper", "Sleeping for " + ToString(scraper_sleep() / 1000) +" seconds");

if (!MilliSleep(scraper_sleep())) return;
if (!MilliSleep(loop_sleep)) return;

// To avoid taking a second lock on cs_main here, which happens inside SuperblockAge(), simply add
// scraper_sleep() to sbage, since that much time has gone by.
sbage += loop_sleep;
nBeforeSBSleep = std::max(86400 - active_before_SB() - sbage, (int64_t) 0);
}
}

Expand Down Expand Up @@ -5711,15 +5718,14 @@ Superblock ScraperGetSuperblockContract(bool bStoreConvergedStats, bool bContrac
_log(logattribute::INFO, "ScraperGetSuperblockContract", "Stored converged stats.");
}

// I know this involves a copy operation, but it minimizes the lock time on the cache... we may want to
// lock before and do a direct assignment, but that will lock the cache for the whole stats computation,
// which is not really necessary.
Superblock superblock_Prev;

{
LOCK(cs_ConvergedScraperStatsCache);

ConvergedScraperStatsCache.AddConvergenceToPastConvergencesMap();

Superblock superblock_Prev = ConvergedScraperStatsCache.NewFormatSuperblock;
superblock_Prev = ConvergedScraperStatsCache.NewFormatSuperblock;

ConvergedScraperStatsCache.mScraperConvergedStats = mScraperConvergedStats;

Expand All @@ -5743,26 +5749,27 @@ Superblock ScraperGetSuperblockContract(bool bStoreConvergedStats, bool bContrac

// If called from housekeeping, mark bMinHousekeepingComplete true
if (bFromHousekeeping) ConvergedScraperStatsCache.bMinHousekeepingComplete = true;
}

// Signal UI of SBContract status
if (superblock.WellFormed())
// Signal UI of SBContract status. cs_ConvergedScraperStatsCache is released before this, because
// BitcoinGUI::updateScraperIcon takes a lock on cs_ConvergedScraperStatsCache itself.
if (superblock.WellFormed())
{
if (superblock_Prev.WellFormed())
{
if (superblock_Prev.WellFormed())
{
// If the current is not empty and the previous is not empty and not the same, then there is
// an updated contract.
if (superblock.GetHash() != superblock_Prev.GetHash())
uiInterface.NotifyScraperEvent(scrapereventtypes::SBContract, CT_UPDATED, {});
}
else
// If the previous was empty and the current is not empty, then there is a new contract.
uiInterface.NotifyScraperEvent(scrapereventtypes::SBContract, CT_NEW, {});
// If the current is not empty and the previous is not empty and not the same, then there is
// an updated contract.
if (superblock.GetHash() != superblock_Prev.GetHash())
uiInterface.NotifyScraperEvent(scrapereventtypes::SBContract, CT_UPDATED, {});
}
else
if (superblock_Prev.WellFormed())
// If the current is empty and the previous was not empty, then the contract has been deleted.
uiInterface.NotifyScraperEvent(scrapereventtypes::SBContract, CT_DELETED, {});
// If the previous was empty and the current is not empty, then there is a new contract.
uiInterface.NotifyScraperEvent(scrapereventtypes::SBContract, CT_NEW, {});
}
else
if (superblock_Prev.WellFormed())
// If the current is empty and the previous was not empty, then the contract has been deleted.
uiInterface.NotifyScraperEvent(scrapereventtypes::SBContract, CT_DELETED, {});

_log(logattribute::INFO, "ScraperGetSuperblockContract", "Superblock object generated from convergence");

Expand Down