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

Change ws timeouts (#452)

Browse Source
This commit is contained in:
KirillPamPam
2024-04-12 14:53:57 +04:00
committed by GitHub
parent d0f909465d
commit 90a8f8ccab
4 changed files with 103 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/GenericWsHead.kt
View File

@@ -42,7 +42,18 @@ class GenericWsHead(
headScheduler: Scheduler,
upstream: DefaultUpstream,
private val chainSpecific: ChainSpecific,
timeout: Duration,
) : GenericHead(upstream.getId(), forkChoice, blockValidator, headScheduler, chainSpecific), Lifecycle {
private val wsHeadTimeout = run {
val defaultTimeout = Duration.ofMinutes(1)
if (timeout >= defaultTimeout) {
timeout.plus(defaultTimeout)
} else {
defaultTimeout
}
}.also {
log.info("WS head timeout for ${upstream.getId()} is $it")
}
private var connectionId: String? = null
private var subscribed = false
@@ -92,7 +103,7 @@ class GenericWsHead(
.map {
chainSpecific.parseHeader(it, "unknown")
}
.timeout(Duration.ofSeconds(60), Mono.error(RuntimeException("No response from subscribe to newHeads")))
.timeout(wsHeadTimeout, Mono.error(RuntimeException("No response from subscribe to newHeads")))
.onErrorResume {
log.error("Error getting heads for $upstreamId", it)
subscribed = false

2
src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/connectors/GenericRpcConnector.kt
View File

@@ -93,6 +93,7 @@ class GenericRpcConnector(
headScheduler,
upstream,
chainSpecific,
expectedBlockTime,
)
// receive all new blocks through WebSockets, but also periodically verify with RPC in case if WS failed
val rpcHead =
@@ -118,6 +119,7 @@ class GenericRpcConnector(
headScheduler,
upstream,
chainSpecific,
expectedBlockTime,
)
}
}

1
src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/connectors/GenericWsConnector.kt
View File

@@ -46,6 +46,7 @@ class GenericWsConnector(
headScheduler,
upstream,
chainSpecific,
expectedBlockTime,
)
liveness = HeadLivenessValidator(head, expectedBlockTime, headLivenessScheduler, upstream.getId())
subscriptions = chainSpecific.makeIngressSubscription(wsSubscriptions)

96
src/test/groovy/io/emeraldpay/dshackle/upstream/ethereum/GenericWsHeadSpec.groovy
View File

@@ -73,7 +73,17 @@ class GenericWsHeadSpec extends Specification {
Flux.fromIterable([headBlock]), "id", new AtomicReference<String>("")
)
def head = new GenericWsHead(new AlwaysForkChoice(), BlockValidator.ALWAYS_VALID, reader, ws, Schedulers.boundedElastic(), Schedulers.boundedElastic(), upstream, EthereumChainSpecific.INSTANCE)
def head = new GenericWsHead(
new AlwaysForkChoice(),
BlockValidator.ALWAYS_VALID,
reader,
ws,
Schedulers.boundedElastic(),
Schedulers.boundedElastic(),
upstream,
EthereumChainSpecific.INSTANCE,
Duration.ofSeconds(60),
)
def res = BlockContainer.from(block)
when:
@@ -112,7 +122,17 @@ class GenericWsHeadSpec extends Specification {
]
}
def head = new GenericWsHead(new AlwaysForkChoice(), BlockValidator.ALWAYS_VALID, apiMock, ws, Schedulers.boundedElastic(), Schedulers.boundedElastic(), upstream, EthereumChainSpecific.INSTANCE)
def head = new GenericWsHead(
new AlwaysForkChoice(),
BlockValidator.ALWAYS_VALID,
apiMock,
ws,
Schedulers.boundedElastic(),
Schedulers.boundedElastic(),
upstream,
EthereumChainSpecific.INSTANCE,
Duration.ofSeconds(60),
)
when:
def act = head.getFlux()
@@ -166,7 +186,17 @@ class GenericWsHeadSpec extends Specification {
]
}
def head = new GenericWsHead(new AlwaysForkChoice(), BlockValidator.ALWAYS_VALID, apiMock, ws, Schedulers.boundedElastic(), Schedulers.boundedElastic(), upstream, EthereumChainSpecific.INSTANCE)
def head = new GenericWsHead(
new AlwaysForkChoice(),
BlockValidator.ALWAYS_VALID,
apiMock,
ws,
Schedulers.boundedElastic(),
Schedulers.boundedElastic(),
upstream,
EthereumChainSpecific.INSTANCE,
Duration.ofSeconds(60),
)
when:
def act = head.getFlux()
@@ -206,7 +236,17 @@ class GenericWsHeadSpec extends Specification {
]
}
def head = new GenericWsHead( new AlwaysForkChoice(), BlockValidator.ALWAYS_VALID, apiMock, ws, Schedulers.boundedElastic(), Schedulers.boundedElastic(), upstream, EthereumChainSpecific.INSTANCE)
def head = new GenericWsHead(
new AlwaysForkChoice(),
BlockValidator.ALWAYS_VALID,
apiMock,
ws,
Schedulers.boundedElastic(),
Schedulers.boundedElastic(),
upstream,
EthereumChainSpecific.INSTANCE,
Duration.ofSeconds(60),
)
when:
def act = head.getFlux()
@@ -245,7 +285,17 @@ class GenericWsHeadSpec extends Specification {
]
}
def head = new GenericWsHead(new AlwaysForkChoice(), BlockValidator.ALWAYS_VALID, apiMock, ws, Schedulers.boundedElastic(), Schedulers.boundedElastic(), upstream, EthereumChainSpecific.INSTANCE)
def head = new GenericWsHead(
new AlwaysForkChoice(),
BlockValidator.ALWAYS_VALID,
apiMock,
ws,
Schedulers.boundedElastic(),
Schedulers.boundedElastic(),
upstream,
EthereumChainSpecific.INSTANCE,
Duration.ofSeconds(60),
)
when:
def act = head.getFlux()
@@ -298,7 +348,17 @@ class GenericWsHeadSpec extends Specification {
]
}
def head = new GenericWsHead(new AlwaysForkChoice(), BlockValidator.ALWAYS_VALID, apiMock, ws, Schedulers.boundedElastic(), Schedulers.boundedElastic(), upstream, EthereumChainSpecific.INSTANCE)
def head = new GenericWsHead(
new AlwaysForkChoice(),
BlockValidator.ALWAYS_VALID,
apiMock,
ws,
Schedulers.boundedElastic(),
Schedulers.boundedElastic(),
upstream,
EthereumChainSpecific.INSTANCE,
Duration.ofSeconds(60),
)
when:
def act = head.getFlux()
@@ -351,7 +411,17 @@ class GenericWsHeadSpec extends Specification {
Mono.just(new ChainResponse("".bytes, null))
}
def head = new GenericWsHead(new AlwaysForkChoice(), BlockValidator.ALWAYS_VALID, reader, ws, Schedulers.boundedElastic(), Schedulers.boundedElastic(), upstream, EthereumChainSpecific.INSTANCE)
def head = new GenericWsHead(
new AlwaysForkChoice(),
BlockValidator.ALWAYS_VALID,
reader,
ws,
Schedulers.boundedElastic(),
Schedulers.boundedElastic(),
upstream,
EthereumChainSpecific.INSTANCE,
Duration.ofSeconds(60),
)
when:
def act = head.getFlux()
@@ -388,7 +458,17 @@ class GenericWsHeadSpec extends Specification {
]
}
def head = new GenericWsHead(new AlwaysForkChoice(), BlockValidator.ALWAYS_VALID, apiMock, ws, Schedulers.boundedElastic(), Schedulers.boundedElastic(), upstream, EthereumChainSpecific.INSTANCE)
def head = new GenericWsHead(
new AlwaysForkChoice(),
BlockValidator.ALWAYS_VALID,
apiMock,
ws,
Schedulers.boundedElastic(),
Schedulers.boundedElastic(),
upstream,
EthereumChainSpecific.INSTANCE,
Duration.ofSeconds(60),
)
when:
head.start()