CORDA-1494: Rename p2pMessagingRetry configuration to flowTimeout configuration to reflect the change in how retries are implemented – it is now on flow rather than message level. (#3339)

node/src/integration-test/kotlin/net/corda/node/services/TimedFlowTests.kt

@@ -23,7 +23,7 @@ import net.corda.core.utilities.seconds
 import net.corda.node.internal.StartedNode
 import net.corda.node.services.config.NodeConfiguration
 import net.corda.node.services.config.NotaryConfig
-import net.corda.node.services.config.P2PMessagingRetryConfiguration
+import net.corda.node.services.config.FlowTimeoutConfiguration
 import net.corda.nodeapi.internal.DevIdentityGenerator
 import net.corda.nodeapi.internal.network.NetworkParametersCopier
 import net.corda.testing.common.internal.testNetworkParameters
@@ -101,8 +101,8 @@ class TimedFlowTests {
                     InternalMockNodeParameters(
                             legalName = CordaX500Name("Alice", "AliceCorp", "GB"),
                             configOverrides = { conf: NodeConfiguration ->
-                                val retryConfig = P2PMessagingRetryConfiguration(1.seconds, 3, 1.0)
-                                doReturn(retryConfig).whenever(conf).p2pMessagingRetry
+                                val retryConfig = FlowTimeoutConfiguration(1.seconds, 3, 1.0)
+                                doReturn(retryConfig).whenever(conf).flowTimeout
                             }
                     )
             )

node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt

@@ -39,7 +39,7 @@ interface NodeConfiguration : NodeSSLConfiguration {
     val networkServices: NetworkServicesConfig?
     val certificateChainCheckPolicies: List<CertChainPolicyConfig>
     val verifierType: VerifierType
-    val p2pMessagingRetry: P2PMessagingRetryConfiguration
+    val flowTimeout: FlowTimeoutConfiguration
     val notary: NotaryConfig?
     val additionalNodeInfoPollingFrequencyMsec: Long
     val p2pAddress: NetworkHostAndPort
@@ -139,12 +139,11 @@ data class NetworkServicesConfig(
 /**
  * Currently only used for notarisation requests.
  *
- * When the response doesn't arrive in time, the message is resent to a different notary-replica round-robin
- * in case of clustered notaries.
+ * Specifies the configuration for timing out and restarting a [TimedFlow].
  */
-data class P2PMessagingRetryConfiguration(
-        val messageRedeliveryDelay: Duration,
-        val maxRetryCount: Int,
+data class FlowTimeoutConfiguration(
+        val timeout: Duration,
+        val maxRestartCount: Int,
         val backoffBase: Double
 )
 
@@ -167,7 +166,7 @@ data class NodeConfigurationImpl(
         override val rpcUsers: List<User>,
         override val security: SecurityConfiguration? = null,
         override val verifierType: VerifierType,
-        override val p2pMessagingRetry: P2PMessagingRetryConfiguration,
+        override val flowTimeout: FlowTimeoutConfiguration,
         override val p2pAddress: NetworkHostAndPort,
         private val rpcAddress: NetworkHostAndPort? = null,
         private val rpcSettings: NodeRpcSettings,

node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt

@@ -609,10 +609,10 @@ class SingleThreadedStateMachineManager(
 
     /** Schedules a [FlowTimeoutException] to be fired in order to restart the flow. */
     private fun scheduleTimeoutException(flow: Flow, retryCount: Int): ScheduledFuture<*> {
-        return with(serviceHub.configuration.p2pMessagingRetry) {
-            val timeoutDelaySeconds = messageRedeliveryDelay.seconds * Math.pow(backoffBase, retryCount.toDouble()).toLong()
+        return with(serviceHub.configuration.flowTimeout) {
+            val timeoutDelaySeconds = timeout.seconds * Math.pow(backoffBase, retryCount.toDouble()).toLong()
             timeoutScheduler.schedule({
-                val event = Event.Error(FlowTimeoutException(maxRetryCount))
+                val event = Event.Error(FlowTimeoutException(maxRestartCount))
                 flow.fiber.scheduleEvent(event)
             }, timeoutDelaySeconds, TimeUnit.SECONDS)
         }

node/src/main/resources/reference.conf

@@ -20,8 +20,8 @@ rpcSettings = {
     useSsl = false
     standAloneBroker = false
 }
-p2pMessagingRetry {
-    messageRedeliveryDelay = 30 seconds
-    maxRetryCount = 3
+flowTimeout {
+    timeout = 30 seconds
+    maxRestartCount = 3
     backoffBase = 2.0
 }

node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt

@@ -229,7 +229,7 @@ class NodeConfigurationImplTest {
                 verifierType = VerifierType.InMemory,
                 p2pAddress = NetworkHostAndPort("localhost", 0),
                 messagingServerAddress = null,
-                p2pMessagingRetry = P2PMessagingRetryConfiguration(5.seconds, 3, 1.0),
+                flowTimeout = FlowTimeoutConfiguration(5.seconds, 3, 1.0),
                 notary = null,
                 devMode = true,
                 noLocalShell = false,

node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt

@@ -8,7 +8,7 @@ import net.corda.core.utilities.seconds
 import net.corda.node.internal.configureDatabase
 import net.corda.node.services.config.CertChainPolicyConfig
 import net.corda.node.services.config.NodeConfiguration
-import net.corda.node.services.config.P2PMessagingRetryConfiguration
+import net.corda.node.services.config.FlowTimeoutConfiguration
 import net.corda.node.services.config.configureWithDevSSLCertificate
 import net.corda.node.services.network.NetworkMapCacheImpl
 import net.corda.node.services.network.PersistentNetworkMapCache
@@ -73,7 +73,7 @@ class ArtemisMessagingTest {
             doReturn(NetworkHostAndPort("0.0.0.0", serverPort)).whenever(it).p2pAddress
             doReturn(null).whenever(it).jmxMonitoringHttpPort
             doReturn(emptyList<CertChainPolicyConfig>()).whenever(it).certificateChainCheckPolicies
-            doReturn(P2PMessagingRetryConfiguration(5.seconds, 3, backoffBase = 1.0)).whenever(it).p2pMessagingRetry
+            doReturn(FlowTimeoutConfiguration(5.seconds, 3, backoffBase = 1.0)).whenever(it).flowTimeout
         }
         LogHelper.setLevel(PersistentUniquenessProvider::class)
         database = configureDatabase(makeTestDataSourceProperties(), DatabaseConfig(), { null }, { null })

node/src/test/resources/working-config.conf

@@ -24,8 +24,8 @@ rpcSettings = {
     useSsl = false
     standAloneBroker = false
 }
-p2pMessagingRetry {
-    messageRedeliveryDelay = 30 seconds
-    maxRetryCount = 3
+flowTimeout {
+    timeout = 30 seconds
+    maxRestartCount = 3
     backoffBase = 2.0
 }