Fixed wrong transition order

IntersectMBO · Jan 26, 2024 · b892ee6 · b892ee6
1 parent d595388
commit b892ee6
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs b/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs
@@ -876,7 +876,7 @@ withConnectionManager ConnectionManagerArguments {
                 Left mbTransition -> do
                   traverse_ (traceWith trTracer) mbTransition
                   close cmSnocket socket
-                  return ( Map.delete peerAddr state
+                  return ( state
                          , Left ()
                          )
                 Right transition -> do
@@ -887,13 +887,23 @@ withConnectionManager ConnectionManagerArguments {
 
             case eTransition of
               Left () -> do
-                traceWith trTracer
-                          (TransitionTrace
-                            peerAddr
-                            Transition
-                               { fromState = Known (TerminatedState Nothing)
-                               , toState   = Unknown
-                               })
+
+                let transition =
+                      TransitionTrace
+                        peerAddr
+                        Transition
+                           { fromState = Known (TerminatedState Nothing)
+                           , toState   = Unknown
+                           }
+                mbTransition <- modifyTMVar stateVar $ \state ->
+                  case Map.lookup peerAddr state of
+                    Nothing -> pure (state, Nothing)
+                    Just v  ->
+                      if mutableConnState == v
+                         then pure (Map.delete peerAddr state , Just transition)
+                         else pure (state                     , Nothing)
+
+                traverse_ (traceWith trTracer) mbTransition
                 traceCounters stateVar
               Right transition ->
                 do traceWith tracer (TrConnectionTimeWait connId)