Remove StorageManager and related dead code

sled-agent/config-reconciler/src/dataset_serialization_task.rs

@@ -37,9 +37,9 @@ use omicron_uuid_kinds::DatasetUuid;
 use sled_storage::config::MountConfig;
 use sled_storage::dataset::CRYPT_DATASET;
 use sled_storage::dataset::ZONE_DATASET;
-use sled_storage::manager::NestedDatasetConfig;
-use sled_storage::manager::NestedDatasetListOptions;
-use sled_storage::manager::NestedDatasetLocation;
+use sled_storage::nested_dataset::NestedDatasetConfig;
+use sled_storage::nested_dataset::NestedDatasetListOptions;
+use sled_storage::nested_dataset::NestedDatasetLocation;
 use slog::Logger;
 use slog::info;
 use slog::warn;

sled-agent/config-reconciler/src/handle.rs

@@ -15,9 +15,9 @@ use omicron_common::disk::DatasetName;
 use sled_agent_api::ArtifactConfig;
 use sled_storage::config::MountConfig;
 use sled_storage::disk::Disk;
-use sled_storage::manager::NestedDatasetConfig;
-use sled_storage::manager::NestedDatasetListOptions;
-use sled_storage::manager::NestedDatasetLocation;
+use sled_storage::nested_dataset::NestedDatasetConfig;
+use sled_storage::nested_dataset::NestedDatasetListOptions;
+use sled_storage::nested_dataset::NestedDatasetLocation;
 use slog::Logger;
 use std::collections::HashSet;
 use std::sync::Arc;

sled-agent/src/artifact_store.rs

@@ -763,9 +763,6 @@ pub enum Error {
     #[error("Error while reading request body")]
     Body(dropshot::HttpError),
 
-    #[error("Error retrieving dataset configuration")]
-    DatasetConfig(#[from] sled_storage::error::Error),
-
     #[error("Error fetching artifact {sha256} from depot at {base_url}")]
     DepotCopy {
         sha256: ArtifactHash,
@@ -863,12 +860,10 @@ impl From<Error> for HttpError {
 
             // 5xx errors: ensure the error chain is logged
             Error::Body(inner) => inner,
-            Error::DatasetConfig(_) | Error::NoUpdateDataset => {
-                HttpError::for_unavail(
-                    None,
-                    InlineErrorChain::new(&err).to_string(),
-                )
-            }
+            Error::NoUpdateDataset => HttpError::for_unavail(
+                None,
+                InlineErrorChain::new(&err).to_string(),
+            ),
             Error::DepotCopy { .. }
             | Error::File { .. }
             | Error::Join(_)

sled-agent/src/sim/storage.rs

@@ -41,9 +41,9 @@ use omicron_uuid_kinds::PhysicalDiskUuid;
 use omicron_uuid_kinds::ZpoolUuid;
 use propolis_client::VolumeConstructionRequest;
 use serde::Serialize;
-use sled_storage::manager::NestedDatasetConfig;
-use sled_storage::manager::NestedDatasetListOptions;
-use sled_storage::manager::NestedDatasetLocation;
+use sled_storage::nested_dataset::NestedDatasetConfig;
+use sled_storage::nested_dataset::NestedDatasetListOptions;
+use sled_storage::nested_dataset::NestedDatasetLocation;
 use slog::Logger;
 use std::collections::BTreeMap;
 use std::collections::HashMap;

sled-agent/src/sled_agent.rs

@@ -128,9 +128,6 @@ pub enum Error {
     #[error("Error managing instances: {0}")]
     Instance(#[from] crate::instance_manager::Error),
 
-    #[error("Error managing storage: {0}")]
-    Storage(#[from] sled_storage::error::Error),
-
     #[error("Error updating: {0}")]
     Download(#[from] crate::updates::Error),
 
@@ -179,7 +176,6 @@ impl From<Error> for omicron_common::api::external::Error {
         match err {
             // Some errors can convert themselves into the external error
             Error::Services(err) => err.into(),
-            Error::Storage(err) => err.into(),
             _ => omicron_common::api::external::Error::InternalError {
                 internal_message: err.to_string(),
             },

sled-agent/src/support_bundle/storage.rs

@@ -14,7 +14,6 @@ use dropshot::HttpError;
 use futures::Stream;
 use futures::StreamExt;
 use illumos_utils::zfs::DatasetProperties;
-use omicron_common::api::external::Error as ExternalError;
 use omicron_common::disk::CompressionAlgorithm;
 use omicron_common::disk::DatasetConfig;
 use omicron_common::disk::DatasetName;
@@ -35,9 +34,9 @@ use sled_agent_config_reconciler::NestedDatasetListError;
 use sled_agent_config_reconciler::NestedDatasetMountError;
 use sled_agent_types::support_bundle::BUNDLE_FILE_NAME;
 use sled_agent_types::support_bundle::BUNDLE_TMP_FILE_NAME;
-use sled_storage::manager::NestedDatasetConfig;
-use sled_storage::manager::NestedDatasetListOptions;
-use sled_storage::manager::NestedDatasetLocation;
+use sled_storage::nested_dataset::NestedDatasetConfig;
+use sled_storage::nested_dataset::NestedDatasetListOptions;
+use sled_storage::nested_dataset::NestedDatasetLocation;
 use slog::Logger;
 use slog_error_chain::InlineErrorChain;
 use std::io::Write;
@@ -84,9 +83,6 @@ pub enum Error {
     #[error(transparent)]
     TryFromInt(#[from] std::num::TryFromIntError),
 
-    #[error(transparent)]
-    Storage(#[from] sled_storage::error::Error),
-
     #[error(transparent)]
     Io(#[from] std::io::Error),
 
@@ -132,7 +128,6 @@ impl From<Error> for HttpError {
             Error::NotAFile => {
                 HttpError::for_bad_request(None, "Not a file".to_string())
             }
-            Error::Storage(err) => HttpError::from(ExternalError::from(err)),
             Error::Zip(err) => match err {
                 ZipError::FileNotFound => HttpError::for_not_found(
                     None,

sled-storage/src/lib.rs

@@ -11,10 +11,6 @@
 pub mod config;
 pub mod dataset;
 pub mod disk;
-pub mod error;
 pub(crate) mod keyfile;
-pub mod manager;
-#[cfg(any(feature = "testing", test))]
-pub mod manager_test_harness;
+pub mod nested_dataset;
 pub mod pool;
-pub mod resources;