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

problem: native calls are execute one by one, and possibly exhausting target upstream

Browse Source
This commit is contained in:
Igor Artamonov
2019-08-09 00:26:44 -04:00
parent 034d0fd601
commit 7f9478d538
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt
View File

@@ -17,6 +17,7 @@ import reactor.core.publisher.toMono
import reactor.util.function.Tuple2 import reactor.util.function.Tuple2
import reactor.util.function.Tuples import reactor.util.function.Tuples
import java.lang.Exception import java.lang.Exception
import java.time.Duration
import java.util.function.Predicate import java.util.function.Predicate
@Service @Service
@@ -30,7 +31,9 @@ class NativeCall(
open fun nativeCall(requestMono: Mono<BlockchainOuterClass.NativeCallRequest>): Flux<BlockchainOuterClass.NativeCallReplyItem> { open fun nativeCall(requestMono: Mono<BlockchainOuterClass.NativeCallRequest>): Flux<BlockchainOuterClass.NativeCallReplyItem> {
return requestMono.flatMapMany(this::prepareCall) return requestMono.flatMapMany(this::prepareCall)
.map(this::setupCallParams) .map(this::setupCallParams)
.parallel()
.flatMap(this::executeOnRemote) .flatMap(this::executeOnRemote)
.sequential()
.map(this::buildResponse) .map(this::buildResponse)
.doOnError { e -> log.warn("Error during native call", e) } .doOnError { e -> log.warn("Error during native call", e) }
.onErrorResume(this::processException) .onErrorResume(this::processException)
@@ -89,7 +92,11 @@ class NativeCall(
fun executeOnRemote(ctx: CallContext<Tuple2<String, List<Any>>>): Mono<CallContext<ByteArray>> { fun executeOnRemote(ctx: CallContext<Tuple2<String, List<Any>>>): Mono<CallContext<ByteArray>> {
val p: Predicate<Any> = CallQuorum.untilResolved(ctx.callQuorum) val p: Predicate<Any> = CallQuorum.untilResolved(ctx.callQuorum)
return ctx.apis.toFlux() val all = ctx.apis.toFlux().share()
//execute on the first API immediately, and then make a delay between each call to not dos upstreams
val immediate = Flux.from(all).take(1)
val retries = Flux.from(all).delayElements(Duration.ofMillis(200))
return Flux.concat(immediate, retries)
.takeWhile(p) .takeWhile(p)
.flatMap { api -> .flatMap { api ->
api.execute(ctx.id, ctx.payload.t1, ctx.payload.t2).map { Tuples.of(it, api.upstream!!) } api.execute(ctx.id, ctx.payload.t1, ctx.payload.t2).map { Tuples.of(it, api.upstream!!) }

2
src/test/groovy/io/emeraldpay/dshackle/upstream/EthereumGrpcTransportSpec.groovy
View File

@@ -93,7 +93,7 @@ class EthereumGrpcTransportSpec extends Specification {
then: then:
1 * otherSideUpstreams.getUpstream(Chain.ETHEREUM) >> otherSideAggr 1 * otherSideUpstreams.getUpstream(Chain.ETHEREUM) >> otherSideAggr
1 * otherSideAggr.getApis(_) >> [otherSideApi].multiply(3).iterator() 1 * otherSideAggr.getApis(_) >> [otherSideApi].multiply(34).iterator()
_ * otherSideAggr.getHead() >> Stub(EthereumHead) _ * otherSideAggr.getHead() >> Stub(EthereumHead)
_ * otherSideAggr.getTargets() >> ethereumTargets _ * otherSideAggr.getTargets() >> ethereumTargets
status.failed == 0 status.failed == 0