Review feedback

- Add more error variants, to better maintain context and the actual
  error chains.
- Remove zone-specific commmands
- Remove hand-rolled `PartialOrd` implementation for simplicity, but add
  comment about the variant order being load-bearing.
- Add the handle for the cleanup task to the `ZoneBundler`, and abort it
  on drop.

Author: bnaecker

sled-agent/src/instance.rs

@@ -48,8 +48,6 @@ use std::sync::Arc;
 use tokio::task::JoinHandle;
 use uuid::Uuid;
 
-//use propolis_client::generated::DiskRequest;
-
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error("Failed to wait for service: {0}")]
@@ -558,7 +556,6 @@ impl InstanceInner {
             .create(
                 &running_state.running_zone,
                 ZoneBundleCause::TerminatedInstance,
-                vec![],
             )
             .await
         {
@@ -683,11 +680,7 @@ impl Instance {
             } => {
                 inner
                     .zone_bundler
-                    .create(
-                        running_zone,
-                        ZoneBundleCause::ExplicitRequest,
-                        vec![],
-                    )
+                    .create(running_zone, ZoneBundleCause::ExplicitRequest)
                     .await
             }
         }

sled-agent/src/services.rs

@@ -2025,15 +2025,15 @@ impl ServiceManager {
                 return self
                     .inner
                     .zone_bundler
-                    .create(zone, ZoneBundleCause::ExplicitRequest, vec![])
+                    .create(zone, ZoneBundleCause::ExplicitRequest)
                     .await;
             }
         }
         if let Some(zone) = self.inner.zones.lock().await.get(name) {
             return self
                 .inner
                 .zone_bundler
-                .create(zone, ZoneBundleCause::ExplicitRequest, vec![])
+                .create(zone, ZoneBundleCause::ExplicitRequest)
                 .await;
         }
         Err(BundleError::NoSuchZone { name: name.to_string() })
@@ -2120,7 +2120,7 @@ impl ServiceManager {
                 if let Err(e) = self
                     .inner
                     .zone_bundler
-                    .create(&zone, ZoneBundleCause::UnexpectedZone, vec![])
+                    .create(&zone, ZoneBundleCause::UnexpectedZone)
                     .await
                 {
                     error!(