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.

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

Remove invalid headers on chain repair #1856

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
different fixes
  • Loading branch information
kushti committed Oct 1, 2022
commit dd19e41c92452178d27706613361543f8b7c4342
Original file line number Diff line number Diff line change
@@ -743,10 +743,9 @@ object ErgoNodeViewHolder {
history.bestFullBlockOpt
.filter(_.id != lastMod.id)
.fold("")(fb => s"\n best full block: $fb")
val repairNeeded = ErgoHistory.repairIfNeeded(history)
ErgoHistory.repairIfNeeded(history) // todo: do we need to do it?
ChainIsStuck(s"Chain not modified for $chainUpdateDelay ms, headers-height: $headersHeight, " +
s"block-height $blockHeight, chain synced: $chainSynced, repair needed: $repairNeeded, " +
s"last modifier applied: $lastMod, " +
s"block-height $blockHeight, chain synced: $chainSynced, last modifier applied: $lastMod, " +
s"possible best full block $bestFullBlockOpt")
} else {
ChainIsHealthy
Original file line number Diff line number Diff line change
@@ -260,7 +260,7 @@ object ErgoHistory extends ScorexLogging {

// check if there is possible database corruption when there is header after
// recognized blockchain tip marked as invalid
protected[nodeView] def repairIfNeeded(history: ErgoHistory): Boolean = history.historyStorage.synchronized {
protected[nodeView] def repairIfNeeded(history: ErgoHistory): Unit = history.historyStorage.synchronized {
val RepairDepth = 128

val bestHeaderHeight = history.headersHeight
@@ -272,16 +272,21 @@ object ErgoHistory extends ScorexLogging {
val notInvalidHeaders = headerIds.filter { headerId =>
if (history.isSemanticallyValid(headerId) == Invalid) {
log.warn(s"Clearing invalid header: $headerId at height $h")
history.forgetHeader()
history.forgetHeader(headerId)
false
} else {
true
}
}
val updatedHeightIdsValue = notInvalidHeaders.foldLeft(Array[Byte].empty) { case (acc, id) =>
val updatedHeightIdsValue: Array[Byte] = notInvalidHeaders.foldLeft(Array.empty[Byte]) { case (acc, id) =>
acc ++ idToBytes(id)
}
history.historyStorage.insert(Array(history.heightIdsKey(h), updatedHeightIdsValue), Nil)
if(updatedHeightIdsValue.isEmpty) {
//could be the case after bestHeaderHeight
history.historyStorage.remove(Array(history.heightIdsKey(h)), Nil)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we also remove the Modifier at this height? Not just index? Or is there an idempotency in place that the modifer gets overriden if index is empty?

} else {
history.historyStorage.insert(Array(history.heightIdsKey(h) -> updatedHeightIdsValue), Nil)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand what we are updating the valid header index with and why, that would need at least a comment

}
checkHeightsFrom(h + 1)
}
}