From 4e16c2a06a3d04aca60db0d2b856be08e9e10466 Mon Sep 17 00:00:00 2001 From: Andras Slemmer Date: Fri, 9 Mar 2018 10:18:39 +0000 Subject: [PATCH] Switch checkpoints on for retryable sends, add back confirmationWindowSize setting --- core/src/main/kotlin/net/corda/core/flows/FlowLogic.kt | 2 +- .../net/corda/node/services/messaging/P2PMessagingClient.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/kotlin/net/corda/core/flows/FlowLogic.kt b/core/src/main/kotlin/net/corda/core/flows/FlowLogic.kt index 5e049b7fff..88829caeec 100644 --- a/core/src/main/kotlin/net/corda/core/flows/FlowLogic.kt +++ b/core/src/main/kotlin/net/corda/core/flows/FlowLogic.kt @@ -153,7 +153,7 @@ abstract class FlowLogic { sessionToMessage = mapOf(this to payload.serialize(context = SerializationDefaults.P2P_CONTEXT)), shouldRetrySend = true ) - return stateMachine.suspend(request, maySkipCheckpoint = true)[this]!!.checkPayloadIs(receiveType) + return stateMachine.suspend(request, maySkipCheckpoint = false)[this]!!.checkPayloadIs(receiveType) } @Suspendable diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt b/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt index cb8176786b..de96ce8d7d 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt @@ -225,6 +225,7 @@ class P2PMessagingClient(val config: NodeConfiguration, clientFailureCheckPeriod = -1 minLargeMessageSize = maxMessageSize isUseGlobalPools = nodeSerializationEnv != null + confirmationWindowSize = config.enterpriseConfiguration.tuning.p2pConfirmationWindowSize } val sessionFactory = locator!!.createSessionFactory() // Login using the node username. The broker will authenticate us as its node (as opposed to another peer)