Some tunes (#549)

drpcorg · Aug 27, 2024 · 8ac58f5 · 8ac58f5
1 parent 68344ce
commit 8ac58f5
Show file tree

Hide file tree

Showing 26 changed files with 140 additions and 63 deletions.
diff --git a/build.gradle b/build.gradle
@@ -190,7 +190,7 @@ jib {
         }
     }
     container {
-        jvmFlags = ['-XX:+UseG1GC', '-XX:+ExitOnOutOfMemoryError', '-Xms1024M', '-XX:+UnlockDiagnosticVMOptions', '-XX:GCLockerRetryAllocationCount=10', '--enable-preview']
+        jvmFlags = ['-XX:+UseG1GC', '-XX:+ExitOnOutOfMemoryError', '-Xms1024M', '-XX:NativeMemoryTracking=summary', '-XX:+UnlockDiagnosticVMOptions', '-XX:GCLockerRetryAllocationCount=10', '--enable-preview']
         mainClass = 'io.emeraldpay.dshackle.StarterKt'
         args = []
         ports = ['2448', '2449', '8545']

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/Defaults.kt b/src/main/kotlin/io/emeraldpay/dshackle/Defaults.kt
@@ -25,6 +25,7 @@ class Defaults {
         const val maxMetadataSize = 16384
         val timeout: Duration = Duration.ofSeconds(60)
         val timeoutInternal: Duration = timeout.dividedBy(4)
+        val internalCallsTimeout = Duration.ofSeconds(3)
         val retryConnection: Duration = Duration.ofSeconds(10)
         val grpcServerKeepAliveTime: Long = 15 // seconds
         val grpcServerKeepAliveTimeout: Long = 5

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/config/context/SchedulersConfig.kt b/src/main/kotlin/io/emeraldpay/dshackle/config/context/SchedulersConfig.kt
@@ -12,7 +12,9 @@ import reactor.core.scheduler.Scheduler
 import reactor.core.scheduler.Schedulers
 import java.util.concurrent.Executor
 import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
+import java.util.concurrent.SynchronousQueue
+import java.util.concurrent.ThreadPoolExecutor
+import java.util.concurrent.TimeUnit
 
 @Configuration
 open class SchedulersConfig {
@@ -79,17 +81,24 @@ open class SchedulersConfig {
     }
 
     private fun makePool(name: String, size: Int, monitoringConfig: MonitoringConfig): ExecutorService {
-        val pool = Executors.newFixedThreadPool(size, CustomizableThreadFactory("$name-"))
+        val cachedPool = ThreadPoolExecutor(
+            size,
+            size * threadsMultiplier,
+            60L,
+            TimeUnit.SECONDS,
+            SynchronousQueue(),
+            CustomizableThreadFactory("$name-"),
+        )
 
         return if (monitoringConfig.enableExtended) {
             ExecutorServiceMetrics.monitor(
                 Metrics.globalRegistry,
-                pool,
+                cachedPool,
                 name,
                 Tag.of("reactor_scheduler_id", "_"),
             )
         } else {
-            pool
+            cachedPool
         }
     }
 }
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/quorum/QuorumRequestReader.kt b/src/main/kotlin/io/emeraldpay/dshackle/quorum/QuorumRequestReader.kt
@@ -178,11 +178,11 @@ class QuorumRequestReader(
             src.onErrorResume { err ->
                 errorHandler.handle(api, key, err.message)
 
-                val msgError = "Error during call upstream ${api.getId()} with method ${key.method}"
+                val msgError = "Error during call upstream ${api.getId()} with method ${key.method}, reason - ${err.message}"
                 if (err is ChainCallUpstreamException) {
-                    log.debug(msgError, err)
+                    log.debug(msgError)
                 } else {
-                    log.warn(msgError, err)
+                    log.warn(msgError)
                 }
 
                 // when the call failed with an error we want to notify the quorum because

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/reader/CompoundReader.kt b/src/main/kotlin/io/emeraldpay/dshackle/reader/CompoundReader.kt
@@ -41,7 +41,7 @@ class CompoundReader<K, D> (
             .flatMap({ rdr ->
                 rdr.read(key)
                     .timeout(Defaults.timeoutInternal, Mono.empty())
-                    .doOnError { t -> log.warn("Failed to read from $rdr", t) }
+                    .doOnError { t -> log.warn("Failed to read from {}, reason - {}", rdr, t.message) }
             }, 1,)
             .next()
     }

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/HttpReader.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/HttpReader.kt
@@ -15,6 +15,7 @@ import java.io.ByteArrayInputStream
 import java.security.KeyStore
 import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
+import java.time.Duration
 import java.util.Base64
 import java.util.function.Consumer
 import java.util.function.Function
@@ -31,7 +32,8 @@ abstract class HttpReader(
     init {
         val connectionProvider = ConnectionProvider.builder("dshackleConnectionPool")
             .maxConnections(1500)
-            .pendingAcquireMaxCount(10000)
+            .pendingAcquireMaxCount(1000)
+            .pendingAcquireTimeout(Duration.ofSeconds(10))
             .build()
 
         var build = HttpClient.create(connectionProvider)

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/UpstreamSettingsDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/UpstreamSettingsDetector.kt
@@ -3,6 +3,7 @@ package io.emeraldpay.dshackle.upstream
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.module.kotlin.readValue
 import io.emeraldpay.dshackle.Chain
+import io.emeraldpay.dshackle.Defaults.Companion.internalCallsTimeout
 import io.emeraldpay.dshackle.Global
 import org.slf4j.LoggerFactory
 import reactor.core.publisher.Flux
@@ -17,15 +18,25 @@ abstract class UpstreamSettingsDetector(
 ) {
     protected val log = LoggerFactory.getLogger(this::class.java)
 
-    abstract fun detectLabels(): Flux<Pair<String, String>>
+    fun detectLabels(): Flux<Pair<String, String>> {
+        return internalDetectLabels()
+            .timeout(internalCallsTimeout)
+            .onErrorResume {
+                log.warn("Couldn't detect lables of upstream {}, message - {}", upstream.getId(), it.message)
+                Flux.empty()
+            }
+    }
+
+    protected abstract fun internalDetectLabels(): Flux<Pair<String, String>>
 
     fun detectClientVersion(): Mono<String> {
         return upstream.getIngressReader()
             .read(clientVersionRequest())
             .flatMap(ChainResponse::requireResult)
             .map(::parseClientVersion)
+            .timeout(internalCallsTimeout)
             .onErrorResume {
-                log.warn("Can't detect the client version of upstream ${upstream.getId()}, reason - {}", it.message)
+                log.warn("Can't detect the client version of upstream {}, reason - {}", upstream.getId(), it.message)
                 Mono.just(UNKNOWN_CLIENT_VERSION)
             }
     }

diff --git a/...kotlin/io/emeraldpay/dshackle/upstream/beaconchain/BeaconChainUpstreamSettingsDetector.kt b/...kotlin/io/emeraldpay/dshackle/upstream/beaconchain/BeaconChainUpstreamSettingsDetector.kt
@@ -21,7 +21,7 @@ class BeaconChainUpstreamSettingsDetector(
         )
     }
 
-    override fun detectLabels(): Flux<Pair<String, String>> {
+    override fun internalDetectLabels(): Flux<Pair<String, String>> {
         return Flux.merge(
             detectNodeType(),
         )

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/cosmos/CosmosLowerBoundService.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/cosmos/CosmosLowerBoundService.kt
@@ -1,6 +1,7 @@
 package io.emeraldpay.dshackle.upstream.cosmos
 
 import io.emeraldpay.dshackle.Chain
+import io.emeraldpay.dshackle.Defaults
 import io.emeraldpay.dshackle.Global
 import io.emeraldpay.dshackle.upstream.ChainRequest
 import io.emeraldpay.dshackle.upstream.Upstream
@@ -31,10 +32,13 @@ class CosmosLowerBoundStateDetector(
     }
 
     override fun internalDetectLowerBound(): Flux<LowerBoundData> {
-        return upstream.getIngressReader().read(ChainRequest("status", ListParams())).map {
-            val resp = Global.objectMapper.readValue(it.getResult(), CosmosStatus::class.java)
-            LowerBoundData(resp.syncInfo.earliestBlockHeight.toLong(), STATE)
-        }.toFlux()
+        return upstream.getIngressReader()
+            .read(ChainRequest("status", ListParams()))
+            .timeout(Defaults.internalCallsTimeout)
+            .map {
+                val resp = Global.objectMapper.readValue(it.getResult(), CosmosStatus::class.java)
+                LowerBoundData(resp.syncInfo.earliestBlockHeight.toLong(), STATE)
+            }.toFlux()
     }
 
     override fun types(): Set<LowerBoundType> {

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/cosmos/CosmosUpstreamSettingsDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/cosmos/CosmosUpstreamSettingsDetector.kt
@@ -14,7 +14,7 @@ import reactor.core.publisher.Flux
 class CosmosUpstreamSettingsDetector(
     upstream: Upstream,
 ) : BasicUpstreamSettingsDetector(upstream) {
-    override fun detectLabels(): Flux<Pair<String, String>> {
+    override fun internalDetectLabels(): Flux<Pair<String, String>> {
         return Flux.merge(
             detectNodeType(),
         )

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumFinalizationDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumFinalizationDetector.kt
@@ -2,6 +2,7 @@ package io.emeraldpay.dshackle.upstream.ethereum
 
 import com.fasterxml.jackson.module.kotlin.readValue
 import io.emeraldpay.dshackle.Chain
+import io.emeraldpay.dshackle.Defaults
 import io.emeraldpay.dshackle.Global
 import io.emeraldpay.dshackle.upstream.ChainRequest
 import io.emeraldpay.dshackle.upstream.Upstream
@@ -72,6 +73,7 @@ class EthereumFinalizationDetector : FinalizationDetector {
                         upstream
                             .getIngressReader()
                             .read(req)
+                            .timeout(Defaults.internalCallsTimeout)
                             .flatMap {
                                 it.requireResult().flatMap { result ->
                                     val block = Global.objectMapper.readValue<BlockJson<TransactionRefJson>>(result)

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundBlockDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundBlockDetector.kt
@@ -1,5 +1,6 @@
 package io.emeraldpay.dshackle.upstream.ethereum
 
+import io.emeraldpay.dshackle.Defaults
 import io.emeraldpay.dshackle.upstream.ChainCallError
 import io.emeraldpay.dshackle.upstream.ChainCallUpstreamException
 import io.emeraldpay.dshackle.upstream.ChainRequest
@@ -45,6 +46,7 @@ class EthereumLowerBoundBlockDetector(
                             ListParams(block.toHex(), false),
                         ),
                     )
+                    .timeout(Defaults.internalCallsTimeout)
                     .doOnNext {
                         if (it.hasResult() && it.getResult().contentEquals("null".toByteArray())) {
                             throw IllegalStateException(NO_BLOCK_DATA)

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundLogsDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundLogsDetector.kt
@@ -1,5 +1,6 @@
 package io.emeraldpay.dshackle.upstream.ethereum
 
+import io.emeraldpay.dshackle.Defaults
 import io.emeraldpay.dshackle.upstream.ChainRequest
 import io.emeraldpay.dshackle.upstream.Upstream
 import io.emeraldpay.dshackle.upstream.lowerbound.LowerBoundData
@@ -39,6 +40,7 @@ class EthereumLowerBoundLogsDetector(
                         ),
                     ),
                 )
+                .timeout(Defaults.internalCallsTimeout)
                 .doOnNext {
                     if (it.hasResult() && (it.getResult().contentEquals("null".toByteArray()) || it.getResult().contentEquals("[]".toByteArray()))) {
                         throw IllegalStateException(NO_LOGS_DATA)

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundStateDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundStateDetector.kt
@@ -1,5 +1,6 @@
 package io.emeraldpay.dshackle.upstream.ethereum
 
+import io.emeraldpay.dshackle.Defaults
 import io.emeraldpay.dshackle.Global
 import io.emeraldpay.dshackle.upstream.ChainRequest
 import io.emeraldpay.dshackle.upstream.ChainResponse
@@ -60,7 +61,7 @@ class EthereumLowerBoundStateDetector(
                         "eth_getBalance",
                         ListParams(ZERO_ADDRESS, block.toHex()),
                     ),
-                )
+                ).timeout(Defaults.internalCallsTimeout)
             }.doOnNext {
                 if (it.hasResult() && it.getResult().contentEquals(Global.nullValue)) {
                     throw IllegalStateException("No state data")

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundTxDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundTxDetector.kt
@@ -1,5 +1,6 @@
 package io.emeraldpay.dshackle.upstream.ethereum
 
+import io.emeraldpay.dshackle.Defaults
 import io.emeraldpay.dshackle.data.BlockContainer
 import io.emeraldpay.dshackle.upstream.ChainRequest
 import io.emeraldpay.dshackle.upstream.Upstream
@@ -32,6 +33,7 @@ class EthereumLowerBoundTxDetector(
                 .read(
                     ChainRequest("eth_getBlockByNumber", ListParams(block.toHex(), false)),
                 )
+                .timeout(Defaults.internalCallsTimeout)
                 .doOnNext {
                     if (it.hasResult() && it.getResult().contentEquals("null".toByteArray())) {
                         throw IllegalStateException(NO_TX_DATA)
@@ -50,6 +52,7 @@ class EthereumLowerBoundTxDetector(
                         .read(
                             ChainRequest("eth_getTransactionByHash", ListParams(tx)),
                         )
+                        .timeout(Defaults.internalCallsTimeout)
                         .doOnNext {
                             if (it.hasResult() && it.getResult().contentEquals("null".toByteArray())) {
                                 throw IllegalStateException(NO_TX_DATA)

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamSettingsDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamSettingsDetector.kt
@@ -11,7 +11,6 @@ import io.emeraldpay.dshackle.upstream.Upstream
 import io.emeraldpay.dshackle.upstream.rpcclient.ListParams
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Mono
-import kotlin.text.toBigInteger
 
 const val ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"
 
@@ -21,7 +20,7 @@ class EthereumUpstreamSettingsDetector(
 ) : BasicEthUpstreamSettingsDetector(_upstream) {
     private val blockNumberReader = EthereumArchiveBlockNumberReader(upstream.getIngressReader())
 
-    override fun detectLabels(): Flux<Pair<String, String>> {
+    override fun internalDetectLabels(): Flux<Pair<String, String>> {
         return Flux.merge(
             detectNodeType(),
             detectArchiveNode(),

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/AggregatedUpstreamValidator.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/AggregatedUpstreamValidator.kt
@@ -1,5 +1,6 @@
 package io.emeraldpay.dshackle.upstream.generic
 
+import io.emeraldpay.dshackle.Defaults.Companion.internalCallsTimeout
 import io.emeraldpay.dshackle.foundation.ChainOptions
 import io.emeraldpay.dshackle.upstream.SingleValidator
 import io.emeraldpay.dshackle.upstream.Upstream
@@ -21,8 +22,9 @@ class AggregatedUpstreamValidator(
         ) { a -> a.map { it as UpstreamAvailability } }
             .map(::resolve)
             .defaultIfEmpty(UpstreamAvailability.OK) // upstream is OK on case there are no validators
+            .timeout(internalCallsTimeout)
             .onErrorResume {
-                log.error("Error during upstream validation for ${upstream.getId()}", it)
+                log.error("Error during upstream validation for {}, reason - {}", upstream.getId(), it.message)
                 Mono.just(UpstreamAvailability.UNAVAILABLE)
             }
     }
@@ -33,13 +35,16 @@ class AggregatedUpstreamValidator(
         ) { a -> a.map { it as ValidateUpstreamSettingsResult } }
             .map(::resolve)
             .defaultIfEmpty(ValidateUpstreamSettingsResult.UPSTREAM_VALID)
+            .timeout(internalCallsTimeout)
             .onErrorResume {
-                log.error("Error during upstream validation for ${upstream.getId()}", it)
+                log.error("Error during upstream validation for {}, reason - {}", upstream.getId(), it.message)
                 Mono.just(ValidateUpstreamSettingsResult.UPSTREAM_FATAL_SETTINGS_ERROR)
             }
     }
 
     override fun validateUpstreamSettingsOnStartup(): ValidateUpstreamSettingsResult {
-        return validateUpstreamSettings().block() ?: ValidateUpstreamSettingsResult.UPSTREAM_VALID
+        return runCatching {
+            validateUpstreamSettings().block(internalCallsTimeout) ?: ValidateUpstreamSettingsResult.UPSTREAM_VALID
+        }.getOrDefault(ValidateUpstreamSettingsResult.UPSTREAM_SETTINGS_ERROR)
     }
 }
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericRpcHead.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericRpcHead.kt
@@ -46,12 +46,15 @@ class GenericRpcHead(
     override fun start() {
         super.start()
         refreshSubscription?.dispose()
+
         val base = Flux.interval(interval)
+            .onBackpressureDrop()
             .publishOn(headScheduler)
             .filter { !isSyncing }
-            .flatMap {
+            .concatMap {
                 getLatestBlock(api)
             }
+
         refreshSubscription = super.follow(base)
     }