oops, this is important

oxidecomputer · Nov 1, 2024 · 489e0d5 · 489e0d5
1 parent 28d0613
commit 489e0d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/upstairs/src/downstairs.rs b/upstairs/src/downstairs.rs
@@ -528,6 +528,12 @@ impl Downstairs {
             self.clients[i].set_delay_us(0);
         }
 
+        // Special-case: if a Downstairs goes away midway through initial
+        // reconciliation, then we have to manually abort reconciliation.
+        if self.clients.iter().any(|c| c.state() == DsState::Reconcile) {
+            self.abort_reconciliation(up_state);
+        }
+
         // If this client is coming back from being offline, then mark that its
         // jobs must be replayed when it completes negotiation.
         if self.clients[client_id].state() == DsState::Offline {

diff --git a/upstairs/src/upstairs.rs b/upstairs/src/upstairs.rs
@@ -2008,8 +2008,7 @@ impl Upstairs {
         self.downstairs
             .notify_nexus_of_client_task_stopped(client_id, reason);
 
-        self.downstairs
-            .reinitialize(client_id, &self.state);
+        self.downstairs.reinitialize(client_id, &self.state);
     }
 
     /// Sets both guest and per-client backpressure