[CORDA-2276]: FlowMonitor repeatedly / indefinitely logs flows in the…

… flow hospital. (fix) (corda#4327)
exFalso · Nov 30, 2018 · 4906358 · 4906358
1 parent 628aa0b
commit 4906358
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
@@ -380,7 +380,7 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
             // Shut down the SMM so no Fibers are scheduled.
             runOnStop += { smm.stop(acceptableLiveFiberCountOnStop()) }
             (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
                 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. */
     abstract fun createStartedNode(nodeInfo: NodeInfo, rpcOps: CordaRPCOps, notaryService: NotaryService?): S
 

diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/StaffedFlowHospital.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/StaffedFlowHospital.kt
@@ -159,6 +159,8 @@ class StaffedFlowHospital(private val flowMessaging: FlowMessaging, private val
         }
     }
 
+    operator fun contains(flowId: StateMachineRunId) = mutex.locked { flowId in flowPatients }
+
     class FlowMedicalHistory {
         internal val records: MutableList<MedicalRecord.Flow> = mutableListOf()
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
+        operator fun contains(flowId: StateMachineRunId) = mutex.locked { flowId in flowPatients }
         class FlowMedicalHistory {
             internal val records: MutableList<MedicalRecord.Flow> = mutableListOf()
@@ Expand Down @@