ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-11 15:32:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[CORDA-2276]: FlowMonitor repeatedly / indefinitely logs flows in the flow hospital. (fix) (#4327)

Browse Source
This commit is contained in:
Michele Sollecito 2018-11-30 09:31:46 +00:00 committed by GitHub
parent 628aa0b799
commit 4906358aa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
View File

@ -380,7 +380,7 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
// Shut down the SMM so no Fibers are scheduled. // Shut down the SMM so no Fibers are scheduled.
runOnStop += { smm.stop(acceptableLiveFiberCountOnStop()) } runOnStop += { smm.stop(acceptableLiveFiberCountOnStop()) }
(smm as? StateMachineManagerInternal)?.let { (smm as? StateMachineManagerInternal)?.let {
val flowMonitor = FlowMonitor(smm::snapshot, configuration.flowMonitorPeriodMillis, configuration.flowMonitorSuspensionLoggingThresholdMillis) val flowMonitor = FlowMonitor({ smm.snapshot().filter { flow -> flow !in smm.flowHospital }.toSet() }, configuration.flowMonitorPeriodMillis, configuration.flowMonitorSuspensionLoggingThresholdMillis)
runOnStop += flowMonitor::stop runOnStop += flowMonitor::stop
flowMonitor.start() flowMonitor.start()
} }
@ -391,6 +391,8 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
} }
} }
private operator fun StaffedFlowHospital.contains(flow: FlowStateMachine<*>) = contains(flow.id)
/** Subclasses must override this to create a "started" node of the desired type, using the provided machinery. */ /** Subclasses must override this to create a "started" node of the desired type, using the provided machinery. */
abstract fun createStartedNode(nodeInfo: NodeInfo, rpcOps: CordaRPCOps, notaryService: NotaryService?): S abstract fun createStartedNode(nodeInfo: NodeInfo, rpcOps: CordaRPCOps, notaryService: NotaryService?): S

2
node/src/main/kotlin/net/corda/node/services/statemachine/StaffedFlowHospital.kt
View File

@ -159,6 +159,8 @@ class StaffedFlowHospital(private val flowMessaging: FlowMessaging, private val
} }
} }
operator fun contains(flowId: StateMachineRunId) = mutex.locked { flowId in flowPatients }
class FlowMedicalHistory { class FlowMedicalHistory {
internal val records: MutableList<MedicalRecord.Flow> = mutableListOf() internal val records: MutableList<MedicalRecord.Flow> = mutableListOf()