StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 5min cooldown for non-consec-blocks (#641)

Browse Source
This commit is contained in:
a10zn8
2025-03-17 16:43:55 +03:00
committed by GitHub
parent 0475b97f96
commit 29971654e6
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/HeadLivenessValidatorImpl.kt
View File

@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory
import reactor.core.publisher.Flux import reactor.core.publisher.Flux
import reactor.core.scheduler.Scheduler import reactor.core.scheduler.Scheduler
import java.time.Duration import java.time.Duration
import java.time.Instant
class HeadLivenessValidatorImpl( class HeadLivenessValidatorImpl(
private val head: Head, private val head: Head,
@@ -15,9 +16,13 @@ class HeadLivenessValidatorImpl(
) : HeadLivenessValidator { ) : HeadLivenessValidator {
companion object { companion object {
const val CHECKED_BLOCKS_UNTIL_LIVE = 3 const val CHECKED_BLOCKS_UNTIL_LIVE = 3
const val COOLDOWN_MINUTES = 5L
private val log = LoggerFactory.getLogger(HeadLivenessValidatorImpl::class.java) private val log = LoggerFactory.getLogger(HeadLivenessValidatorImpl::class.java)
} }
@Volatile
private var lastNonConsecutiveTime: Instant? = null
override fun getFlux(): Flux<HeadLivenessState> { override fun getFlux(): Flux<HeadLivenessState> {
val headLiveness = head.headLiveness() val headLiveness = head.headLiveness()
// first we have moving window of 2 blocks and check that they are consecutive ones // first we have moving window of 2 blocks and check that they are consecutive ones
@@ -33,14 +38,29 @@ class HeadLivenessValidatorImpl(
} else { } else {
ThrottledLogger.log(log, "non consecutive blocks in head for $upstreamId") ThrottledLogger.log(log, "non consecutive blocks in head for $upstreamId")
} }
// Mark the time when we detected non-consecutive blocks
lastNonConsecutiveTime = Instant.now()
Pair(0, false) Pair(0, false)
} }
}.flatMap { (count, value) -> }.flatMap { (count, value) ->
// we emit when we have false or checked CHECKED_BLOCKS_UNTIL_LIVE blocks // we emit when we have false or checked CHECKED_BLOCKS_UNTIL_LIVE blocks
// CHECKED_BLOCKS_UNTIL_LIVE blocks == (CHECKED_BLOCKS_UNTIL_LIVE - 1) consecutive true // CHECKED_BLOCKS_UNTIL_LIVE blocks == (CHECKED_BLOCKS_UNTIL_LIVE - 1) consecutive true
when { when {
count >= (CHECKED_BLOCKS_UNTIL_LIVE - 1) -> Flux.just(HeadLivenessState.OK) !value -> {
!value -> Flux.just(HeadLivenessState.NON_CONSECUTIVE) Flux.just(HeadLivenessState.NON_CONSECUTIVE)
}
count >= (CHECKED_BLOCKS_UNTIL_LIVE - 1) -> {
// Check if we're still in the cooldown period
val lastNonConsec = lastNonConsecutiveTime
if (lastNonConsec != null && Duration.between(lastNonConsec, Instant.now()).toMinutes() < COOLDOWN_MINUTES) {
if (log.isDebugEnabled) {
log.debug("Still in cooldown period for $upstreamId after non-consecutive blocks")
}
Flux.just(HeadLivenessState.NON_CONSECUTIVE)
} else {
Flux.just(HeadLivenessState.OK)
}
}
else -> Flux.empty() else -> Flux.empty()
} }
}.timeout( }.timeout(