mirror of
https://github.com/corda/corda.git
synced 2025-03-14 08:16:32 +00:00
Merge fixes
This commit is contained in:
parent
03fae9bd7d
commit
78a5c708d2
@ -10,7 +10,6 @@
|
||||
|
||||
package net.corda.node.services.config
|
||||
|
||||
import net.corda.node.services.statemachine.transitions.StateMachineConfiguration
|
||||
import java.net.InetAddress
|
||||
|
||||
data class EnterpriseConfiguration(
|
||||
@ -46,8 +45,7 @@ data class PerformanceTuning(
|
||||
val maximumMessagingBatchSize: Int,
|
||||
val rpcThreadPoolSize: Int,
|
||||
val p2pConfirmationWindowSize: Int,
|
||||
val brokerConnectionTtlCheckIntervalMs: Long,
|
||||
val stateMachine: StateMachineConfiguration
|
||||
val brokerConnectionTtlCheckIntervalMs: Long
|
||||
) {
|
||||
companion object {
|
||||
val default = PerformanceTuning(
|
||||
@ -55,8 +53,7 @@ data class PerformanceTuning(
|
||||
maximumMessagingBatchSize = 256,
|
||||
rpcThreadPoolSize = 4,
|
||||
p2pConfirmationWindowSize = 1048576,
|
||||
brokerConnectionTtlCheckIntervalMs = 20,
|
||||
stateMachine = StateMachineConfiguration.default
|
||||
brokerConnectionTtlCheckIntervalMs = 20
|
||||
)
|
||||
}
|
||||
}
|
||||
|
@ -23,20 +23,12 @@ import net.corda.core.flows.FlowInfo
|
||||
import net.corda.core.flows.FlowLogic
|
||||
import net.corda.core.flows.StateMachineRunId
|
||||
import net.corda.core.identity.Party
|
||||
import net.corda.core.internal.ConcurrentBox
|
||||
import net.corda.core.internal.FlowStateMachine
|
||||
import net.corda.core.internal.LifeCycle
|
||||
import net.corda.core.internal.bufferUntilSubscribed
|
||||
import net.corda.core.internal.castIfPossible
|
||||
import net.corda.core.internal.*
|
||||
import net.corda.core.internal.concurrent.OpenFuture
|
||||
import net.corda.core.internal.concurrent.map
|
||||
import net.corda.core.internal.concurrent.openFuture
|
||||
import net.corda.core.messaging.DataFeed
|
||||
import net.corda.core.serialization.SerializationContext
|
||||
import net.corda.core.serialization.SerializationDefaults
|
||||
import net.corda.core.serialization.SerializedBytes
|
||||
import net.corda.core.serialization.deserialize
|
||||
import net.corda.core.serialization.serialize
|
||||
import net.corda.core.serialization.*
|
||||
import net.corda.core.utilities.ProgressTracker
|
||||
import net.corda.core.utilities.Try
|
||||
import net.corda.core.utilities.contextLogger
|
||||
@ -47,12 +39,7 @@ import net.corda.node.services.api.ServiceHubInternal
|
||||
import net.corda.node.services.config.shouldCheckCheckpoints
|
||||
import net.corda.node.services.messaging.DeduplicationHandler
|
||||
import net.corda.node.services.messaging.ReceivedMessage
|
||||
import net.corda.node.services.statemachine.interceptors.DumpHistoryOnErrorInterceptor
|
||||
import net.corda.node.services.statemachine.interceptors.FiberDeserializationChecker
|
||||
import net.corda.node.services.statemachine.interceptors.FiberDeserializationCheckingInterceptor
|
||||
import net.corda.node.services.statemachine.interceptors.HospitalisingInterceptor
|
||||
import net.corda.node.services.statemachine.interceptors.MetricInterceptor
|
||||
import net.corda.node.services.statemachine.interceptors.PrintingInterceptor
|
||||
import net.corda.node.services.statemachine.interceptors.*
|
||||
import net.corda.node.services.statemachine.transitions.StateMachine
|
||||
import net.corda.node.utilities.AffinityExecutor
|
||||
import net.corda.nodeapi.internal.persistence.CordaPersistence
|
||||
@ -299,8 +286,6 @@ class MultiThreadedStateMachineManager(
|
||||
}
|
||||
}
|
||||
|
||||
private val stateMachineConfiguration = serviceHub.configuration.enterpriseConfiguration.tuning.stateMachine
|
||||
|
||||
private fun checkQuasarJavaAgentPresence() {
|
||||
check(SuspendableHelper.isJavaAgentActive(), {
|
||||
"""Missing the '-javaagent' JVM argument. Make sure you run the tests with the Quasar java agent attached to your JVM.
|
||||
@ -593,7 +578,7 @@ class MultiThreadedStateMachineManager(
|
||||
database = database,
|
||||
transitionExecutor = transitionExecutor,
|
||||
actionExecutor = actionExecutor!!,
|
||||
stateMachine = StateMachine(id, stateMachineConfiguration, secureRandom),
|
||||
stateMachine = StateMachine(id, secureRandom),
|
||||
serviceHub = serviceHub,
|
||||
checkpointSerializationContext = checkpointSerializationContext!!
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user