Add a connection_id field to the Client

Author: leftwo

upstairs/src/client.rs

@@ -195,6 +195,9 @@ pub(crate) struct DownstairsClient {
 
     /// State for startup negotiation
     negotiation_state: NegotiationState,
+
+    /// Session ID for a clients connection to a downstairs.
+    connection_id: usize,
 }
 
 impl DownstairsClient {
@@ -231,6 +234,7 @@ impl DownstairsClient {
             region_metadata: None,
             repair_info: None,
             io_state_count: ClientIOStateCount::new(),
+            connection_id: 0,
         }
     }
 
@@ -267,6 +271,7 @@ impl DownstairsClient {
             region_metadata: None,
             repair_info: None,
             io_state_count: ClientIOStateCount::new(),
+            connection_id: 0,
         }
     }
 
@@ -604,6 +609,7 @@ impl DownstairsClient {
             self.state = DsState::New;
         }
 
+        self.connection_id += 1;
         // Restart with a short delay
         self.start_task(true, auto_promote);
     }
@@ -2185,13 +2191,13 @@ impl DownstairsClient {
         (self.io_state_count.new + self.io_state_count.in_progress) as usize
     }
 
-    /// Returns a unique ID for the current connect, or `None`
+    /// Returns a unique ID for the current connection, or `None`
     ///
     /// This can be used to disambiguate between messages returned from
     /// different connections to the same Downstairs.
     pub(crate) fn get_connection_id(&self) -> Option<u64> {
         if self.client_task.client_stop_tx.is_some() {
-            Some(self.stats.connected as u64)
+            Some(self.connection_id as u64)
         } else {
             None
         }

upstairs/src/downstairs.rs

@@ -3046,26 +3046,6 @@ impl Downstairs {
                 );
                 return Err(CrucibleError::NoLongerActive);
             }
-            DsState::Offline => {
-                // If we have gone offline, it's possible that a job landed just
-                // before the downstairs went away.  If we have moved jobs to New, it
-                // means we plan to replay them and we can discard this job now.
-                if let Some(job) = self.ds_active.get(&ds_id) {
-                    if job.state[client_id] == IOState::New {
-                        warn!(
-                            self.clients[client_id].log,
-                            "Drop job {} because we are {}", ds_id, ds_state
-                        );
-                        return Err(CrucibleError::NoLongerActive);
-                    }
-                }
-                warn!(
-                    self.clients[client_id].log,
-                    "{} WARNING finish job {} when downstairs Offline",
-                    self.cfg.upstairs_id,
-                    ds_id,
-                );
-            }
             _ => {
                 warn!(
                     self.clients[client_id].log,