ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 04:57:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

persist some nonsense data to see if it breaks the statemachine

Browse Source
This commit is contained in:
stefano 2020-01-30 18:18:45 +00:00
parent 2b079bd92e
commit eec9ada6ba
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt
View File

@ -66,7 +66,7 @@ class DBCheckpointStorage : CheckpointStorage {
var exceptionDetails: DBFlowException? = null,
@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "flow_id")
@JoinColumn(name = "flow_id", referencedColumnName = "flow_id")
var flowMetadata: DBFlowMetadata? = null,
@Column(name = "status")
@ -145,9 +145,6 @@ class DBCheckpointStorage : CheckpointStorage {
class DBFlowMetadata(
@Id
@Column(name = "id", nullable = false)
var id: BigInteger? = null,
@Column(name = "flow_id", length = 64, nullable = false)
var flowId: String? = null,

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

@ -34,6 +34,7 @@ import net.corda.node.services.api.CheckpointStorage
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.persistence.DBCheckpointStorage
import net.corda.node.services.statemachine.FlowStateMachineImpl.Companion.createSubFlowVersion
import net.corda.node.services.statemachine.interceptors.*
import net.corda.node.services.statemachine.transitions.StateMachine
@ -42,6 +43,7 @@ import net.corda.node.utilities.errorAndTerminate
import net.corda.node.utilities.injectOldProgressTracker
import net.corda.node.utilities.isEnabledTimedFlow
import net.corda.nodeapi.internal.persistence.CordaPersistence
import net.corda.nodeapi.internal.persistence.currentDBSession
import net.corda.nodeapi.internal.persistence.wrapWithDatabaseTransaction
import net.corda.serialization.internal.CheckpointSerializeAsTokenContextImpl
import net.corda.serialization.internal.withTokenContext
@ -586,6 +588,46 @@ class SingleThreadedStateMachineManager(
val flowAlreadyExists = mutex.locked { flows[flowId] != null }
val existingCheckpoint = if (flowAlreadyExists) {
val currentDBSession = currentDBSession()
val dbFlowCheckpoint = currentDBSession.get(DBCheckpointStorage.DBFlowCheckpoint::class.java, flowId.toString())
?: DBCheckpointStorage.DBFlowCheckpoint(
flowId.toString(),
null,
null,
null,
null,
DBCheckpointStorage.FlowStatus.RUNNABLE,
true,
flowLogic.progressTracker?.currentStep?.toString(),
null,
null
)
var cordappName : String? = null
var initiatingParty: String? = null
var startReason: DBCheckpointStorage.StartReason = DBCheckpointStorage.StartReason.FLOW
when (flowStart) {
is FlowStart.Initiated -> {
cordappName = flowStart.initiatedFlowInfo.appName
initiatingParty = flowStart.peerSession.counterparty.name.toString()
startReason = DBCheckpointStorage.StartReason.INITIATED
}
}
currentDBSession.get(DBCheckpointStorage.DBFlowMetadata::class.java, flowId.toString()) ?: DBCheckpointStorage.DBFlowMetadata(
flowId = flowId.toString(),
flowName = "thisIsAPlaceholder",
userSuppliedIdentifier = "thisIsAnotherPlaceholder",
startType = startReason,
initialParameters = null,
launchingCordapp = cordappName
)
currentDBSession.persist(dbFlowCheckpoint)
// Load the flow's checkpoint
// The checkpoint will be missing if the flow failed before persisting the original checkpoint
// CORDA-3359 - Do not start/retry a flow that failed after deleting its checkpoint (the whole of the flow might replay)