TQ: Remove Faults from test-utils TqState

`Faults` has become a layer of indirection for reaching `crashed_nodes`.
Early on when writing this test I figured that we'd have separate
actions for connecting and disconnecting nodes in addition to crashing
and restarting them. While I didn't open the possibility to asynchronous
connectivity (hard to do realistically with TLS!), I made it so that we
could track connectivity between alive nodes.

With further reflection this seems unnecessary. As of #8993, we crash
and restart nodes. We anticipate on restart that every alive node
will reconnect at some point. And reconection can trigger the sending
of messages destined for a crashed node. This is how retries are
implemented in this connection oriented protocol. So the only real thing
we are trying to ensure is that those retried messages get interleaved
upon connection and don't always end up delivered in the same order at
the destination node. This is accomplished by randomising the connection
order. If we decide later on that we want to interleave connections
via a new action we can add similar logic and remove the automatic
`on_connect` calls..

Author: andrewjstone

trust-quorum/test-utils/src/state.rs

@@ -53,7 +53,7 @@ pub struct TqState {
     pub member_universe: Vec<PlatformId>,
 
     /// All possible system faults in our test
-    pub faults: Faults,
+    pub crashed_nodes: BTreeSet<PlatformId>,
 
     /// All configurations ever generated by a coordinator.
     ///
@@ -79,7 +79,7 @@ impl TqState {
             underlay_network: Vec::new(),
             nexus: NexusState::new(),
             member_universe,
-            faults: Faults::default(),
+            crashed_nodes: BTreeSet::new(),
             all_coordinated_configs: IdOrdMap::new(),
             expunged: BTreeSet::new(),
         }
@@ -91,7 +91,7 @@ impl TqState {
     pub fn send_reconfigure_msg(&mut self) {
         let (coordinator, msg) = self.nexus.reconfigure_msg_for_latest_config();
         let epoch_to_config = msg.epoch;
-        if self.faults.crashed_nodes.contains(coordinator) {
+        if self.crashed_nodes.contains(coordinator) {
             // We must abort the configuration. This mimics a timeout.
             self.nexus.abort_reconfiguration();
         } else {
@@ -125,7 +125,7 @@ impl TqState {
         let (coordinator, msg) = self.nexus.reconfigure_msg_for_latest_config();
 
         // The coordinator should have received the `ReconfigureMsg` from Nexus
-        if !self.faults.crashed_nodes.contains(coordinator) {
+        if !self.crashed_nodes.contains(coordinator) {
             let (node, ctx) = self
                 .sut
                 .nodes
@@ -134,22 +134,24 @@ impl TqState {
             let mut connected_members = 0;
             // The coordinator should start preparing by sending a `PrepareMsg` to all
             // connected nodes in the membership set.
-            for member in
-                msg.members.iter().filter(|&id| id != coordinator).cloned()
+            for member in msg
+                .members
+                .iter()
+                .filter(|&id| {
+                    !self.crashed_nodes.contains(id) && id != ctx.platform_id()
+                })
+                .cloned()
             {
-                if self.faults.is_connected(coordinator.clone(), member.clone())
-                {
-                    connected_members += 1;
-                    let msg_found = ctx.envelopes().any(|envelope| {
-                        envelope.to == member
-                            && envelope.from == *coordinator
-                            && matches!(
-                                envelope.msg.kind,
-                                PeerMsgKind::Prepare { .. }
-                            )
-                    });
-                    assert!(msg_found);
-                }
+                connected_members += 1;
+                let msg_found = ctx.envelopes().any(|envelope| {
+                    envelope.to == member
+                        && envelope.from == *coordinator
+                        && matches!(
+                            envelope.msg.kind,
+                            PeerMsgKind::Prepare { .. }
+                        )
+                });
+                assert!(msg_found);
             }
             assert_eq!(connected_members, ctx.envelopes().count());
 
@@ -179,7 +181,7 @@ impl TqState {
         // Only send envelopes to alive nodes
         for envelope in ctx
             .drain_envelopes()
-            .filter(|e| !self.faults.crashed_nodes.contains(&e.to))
+            .filter(|e| !self.crashed_nodes.contains(&e.to))
         {
             let msgs =
                 self.bootstrap_network.entry(envelope.to.clone()).or_default();
@@ -244,7 +246,7 @@ impl TqState {
         // Create the SUT nodes
         self.sut = Sut::new(&self.log, self.member_universe.clone());
 
-        self.faults.crashed_nodes = crashed_nodes;
+        self.crashed_nodes = crashed_nodes;
 
         // Inform nexus about the initial configuration
         self.nexus.configs.insert_unique(config).expect("new config");
@@ -254,11 +256,13 @@ impl TqState {
             .sut
             .nodes
             .iter_mut()
-            .filter(|(id, _)| !self.faults.crashed_nodes.contains(id))
+            .filter(|(id, _)| !self.crashed_nodes.contains(id))
         {
-            for to in self.member_universe.iter().filter(|id| {
-                !self.faults.crashed_nodes.contains(id) && from != *id
-            }) {
+            for to in self
+                .member_universe
+                .iter()
+                .filter(|id| !self.crashed_nodes.contains(id) && from != *id)
+            {
                 node.on_connect(ctx, to.clone());
             }
         }
@@ -342,7 +346,7 @@ impl TqState {
         self.bootstrap_network.remove(&id);
 
         // Keep track of the crashed node
-        self.faults.crashed_nodes.insert(id.clone());
+        self.crashed_nodes.insert(id.clone());
 
         // We get to define the semantics of the network with regards to an
         // inflight message sourced from a crashed node. We have two choices:
@@ -358,7 +362,7 @@ impl TqState {
             .sut
             .nodes
             .iter_mut()
-            .filter(|(id, _)| !self.faults.crashed_nodes.contains(id))
+            .filter(|(id, _)| !self.crashed_nodes.contains(id))
         {
             node.on_disconnect(ctx, id.clone());
         }
@@ -390,14 +394,18 @@ impl TqState {
             send_envelopes(
                 peer_ctx,
                 &mut self.bootstrap_network,
-                &mut self.faults,
+                &self.crashed_nodes,
             );
 
             let (node, ctx) = self.sut.nodes.get_mut(&id).expect("node exists");
             // Inform the restarted node of the connection
             node.on_connect(ctx, peer);
             // Send any messages output as a result of the connection
-            send_envelopes(ctx, &mut self.bootstrap_network, &self.faults);
+            send_envelopes(
+                ctx,
+                &mut self.bootstrap_network,
+                &self.crashed_nodes,
+            );
         }
     }
 
@@ -478,7 +486,7 @@ impl TqState {
         }
 
         // Send any messages as a result of handling this message
-        send_envelopes(ctx, &mut self.bootstrap_network, &self.faults);
+        send_envelopes(ctx, &mut self.bootstrap_network, &self.crashed_nodes);
 
         // Remove any destinations with zero messages in-flight
         self.bootstrap_network.retain(|_, msgs| !msgs.is_empty());
@@ -536,10 +544,10 @@ impl TqState {
 fn send_envelopes(
     ctx: &mut NodeCtx,
     bootstrap_network: &mut BTreeMap<PlatformId, Vec<Envelope>>,
-    faults: &Faults,
+    crashed_nodes: &BTreeSet<PlatformId>,
 ) {
     for envelope in
-        ctx.drain_envelopes().filter(|e| !faults.crashed_nodes.contains(&e.to))
+        ctx.drain_envelopes().filter(|e| !crashed_nodes.contains(&e.to))
     {
         let envelopes =
             bootstrap_network.entry(envelope.to.clone()).or_default();
@@ -574,55 +582,6 @@ impl Sut {
     }
 }
 
-/// Faults in our system. It's useful to keep these self contained and not
-/// in separate fields in `TestState` so that we can access them all at once
-/// independently of other `TestState` fields.
-#[derive(Default, Debug, Clone, Diffable)]
-pub struct Faults {
-    // We allow nodes to crash and restart and therefore track crashed nodes here.
-    //
-    // A crashed node is implicitly disconnected from every other node. We don't
-    // bother storing the pairs in `disconnected_nodes`, but instead check both
-    // fields when necessary.
-    pub crashed_nodes: BTreeSet<PlatformId>,
-
-    /// The set of disconnected nodes
-    pub disconnected_nodes: DisconnectedNodes,
-}
-
-impl Faults {
-    pub fn is_connected(&self, node1: PlatformId, node2: PlatformId) -> bool {
-        !self.crashed_nodes.contains(&node1)
-            && !self.crashed_nodes.contains(&node2)
-            && !self.disconnected_nodes.contains(node1, node2)
-    }
-}
-
-/// For cardinality purposes, we assume all nodes are connected and explicitly
-/// disconnect some of them. This allows us to track and compare much less data.
-#[derive(Default, Debug, Clone, Diffable)]
-pub struct DisconnectedNodes {
-    // We sort each pair on insert for quick lookups
-    pairs: BTreeSet<(PlatformId, PlatformId)>,
-}
-
-impl DisconnectedNodes {
-    // Return true if the pair is newly inserted
-    pub fn insert(&mut self, node1: PlatformId, node2: PlatformId) -> bool {
-        assert_ne!(node1, node2);
-
-        let pair = if node1 < node2 { (node1, node2) } else { (node2, node1) };
-        self.pairs.insert(pair)
-    }
-
-    // Return true if the pair of nodes is disconnected, false otherwise
-    pub fn contains(&self, node1: PlatformId, node2: PlatformId) -> bool {
-        assert_ne!(node1, node2);
-        let pair = if node1 < node2 { (node1, node2) } else { (node2, node1) };
-        self.pairs.contains(&pair)
-    }
-}
-
 /*****************************************************************************
  *
  * Diff related display code
@@ -657,7 +616,7 @@ impl Display for TqStateDiff<'_> {
         display_bootstrap_network_diff(&self.bootstrap_network, f)?;
         display_underlay_network_diff(&self.underlay_network, f)?;
         display_nexus_state_diff(&self.nexus, f)?;
-        display_faults_diff(&self.faults, f)?;
+        display_faults_diff(&self.crashed_nodes, f)?;
         display_expunged_diff(&self.expunged, f)?;
 
         Ok(())
@@ -678,34 +637,22 @@ fn display_expunged_diff(
 }
 
 fn display_faults_diff(
-    diff: &FaultsDiff<'_>,
+    crashed_nodes: &BTreeSetDiff<'_, PlatformId>,
     f: &mut std::fmt::Formatter<'_>,
 ) -> std::fmt::Result {
-    if !diff.crashed_nodes.added.is_empty() {
+    if !crashed_nodes.added.is_empty() {
         writeln!(f, "  Nodes crashed:")?;
-        for id in &diff.crashed_nodes.added {
+        for id in &crashed_nodes.added {
             writeln!(f, "    {id}")?;
         }
     }
-    if !diff.crashed_nodes.removed.is_empty() {
+    if !crashed_nodes.removed.is_empty() {
         writeln!(f, "  nodes started:")?;
-        for id in &diff.crashed_nodes.removed {
+        for id in &crashed_nodes.removed {
             writeln!(f, "    {id}")?;
         }
     }
 
-    if !diff.disconnected_nodes.pairs.added.is_empty() {
-        writeln!(f, "  nodes disconnected from each other:")?;
-        for pair in &diff.disconnected_nodes.pairs.added {
-            writeln!(f, "    {},  {}", pair.0, pair.1)?;
-        }
-    }
-    if !diff.disconnected_nodes.pairs.removed.is_empty() {
-        writeln!(f, "  nodes connected to each other:")?;
-        for pair in &diff.disconnected_nodes.pairs.removed {
-            writeln!(f, "    {},  {}", pair.0, pair.1)?;
-        }
-    }
     Ok(())
 }
 

trust-quorum/tests/cluster.rs

@@ -166,7 +166,7 @@ impl TestState {
         // bootstrap network. We could choose not to actually deliver it when
         // applying the event, but that means we have events that don't actually
         // do anything in our event log, which is quite misleading.
-        assert!(!self.tq_state.faults.crashed_nodes.contains(destination));
+        assert!(!self.tq_state.crashed_nodes.contains(destination));
 
         // We pop from the back and push on the front
         let envelope = self
@@ -186,7 +186,7 @@ impl TestState {
             .tq_state
             .member_universe
             .iter()
-            .filter(|m| !self.tq_state.faults.crashed_nodes.contains(&m))
+            .filter(|m| !self.tq_state.crashed_nodes.contains(&m))
             .peekable();
 
         if faultable.peek().is_none() {
@@ -203,12 +203,12 @@ impl TestState {
         id: Selector,
         connection_order_indexes: Vec<Index>,
     ) -> Vec<Event> {
-        if self.tq_state.faults.crashed_nodes.is_empty() {
+        if self.tq_state.crashed_nodes.is_empty() {
             return vec![];
         }
 
         // Choose the node to restart
-        let id = id.select(self.tq_state.faults.crashed_nodes.iter()).clone();
+        let id = id.select(self.tq_state.crashed_nodes.iter()).clone();
 
         // Now order the peer connections
 
@@ -217,7 +217,7 @@ impl TestState {
             .tq_state
             .member_universe
             .iter()
-            .filter(|id| !self.tq_state.faults.crashed_nodes.contains(id))
+            .filter(|id| !self.tq_state.crashed_nodes.contains(id))
             .cloned()
             .collect();
 
@@ -253,7 +253,7 @@ impl TestState {
             let mut loadable = c
                 .members
                 .iter()
-                .filter(|m| !self.tq_state.faults.crashed_nodes.contains(m))
+                .filter(|m| !self.tq_state.crashed_nodes.contains(m))
                 .peekable();
             if loadable.peek().is_some() {
                 let id = selector.select(loadable).clone();
@@ -292,7 +292,7 @@ impl TestState {
         let mut loadable = c
             .members
             .iter()
-            .filter(|m| !self.tq_state.faults.crashed_nodes.contains(m))
+            .filter(|m| !self.tq_state.crashed_nodes.contains(m))
             .peekable();
         if loadable.peek().is_none() {
             return vec![];
@@ -311,12 +311,7 @@ impl TestState {
 
         // If the coordinator has crashed then Nexus should abort.
         // Crashing is not actually implemented yet, but it will be.
-        if self
-            .tq_state
-            .faults
-            .crashed_nodes
-            .contains(&latest_config.coordinator)
-        {
+        if self.tq_state.crashed_nodes.contains(&latest_config.coordinator) {
             events.push(Event::AbortConfiguration(latest_config.epoch));
             return events;
         }
@@ -369,7 +364,7 @@ impl TestState {
         let committable: Vec<_> = latest_config
             .prepared_members
             .difference(&latest_config.committed_members)
-            .filter(|m| !self.tq_state.faults.crashed_nodes.contains(m))
+            .filter(|m| !self.tq_state.crashed_nodes.contains(m))
             .collect();
 
         if committable.is_empty() {