Skip to content

Split datastore::volume file into several files #10149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jmpesp wants to merge 1 commit into from
+3,383 −3,317
Closed

Split datastore::volume file into several files #10149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev-tools/omdb/src/bin/omdb/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ use nexus_db_queries::context::OpContext;
use nexus_db_queries::db;
use nexus_db_queries::db::DataStore;
use nexus_db_queries::db::datastore::CrucibleDisk;
use nexus_db_queries::db::datastore::CrucibleTargets;
use nexus_db_queries::db::datastore::Disk;
use nexus_db_queries::db::datastore::InstanceAndActiveVmm;
use nexus_db_queries::db::datastore::InstanceStateComputer;
use nexus_db_queries::db::datastore::LocalStorageAllocation;
use nexus_db_queries::db::datastore::LocalStorageDisk;
use nexus_db_queries::db::datastore::SQL_BATCH_SIZE;
use nexus_db_queries::db::datastore::VolumeCookedResult;
use nexus_db_queries::db::datastore::read_only_resources_associated_with_volume;
use nexus_db_queries::db::datastore::volume::CrucibleTargets;
use nexus_db_queries::db::datastore::volume::VolumeCookedResult;
use nexus_db_queries::db::datastore::volume::read_only_resources_associated_with_volume;
use nexus_db_queries::db::identity::Asset;
use nexus_db_queries::db::model::ServiceKind;
use nexus_db_queries::db::pagination::Paginator;
Expand Down
6 changes: 3 additions & 3 deletions nexus/db-queries/src/db/datastore/disk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,9 +1886,9 @@ impl DataStore {
params: &disk_types::DiskCreate,
src: &ReadOnlyDiskSource,
) -> Result<db::datastore::Disk, diesel::result::Error> {
use crate::db::datastore::CrucibleTargets;
use crate::db::datastore::VolumeCheckoutReason;
use crate::db::datastore::read_only_resources_associated_with_volume;
use crate::db::datastore::volume::CrucibleTargets;
use crate::db::datastore::volume::VolumeCheckoutReason;
use crate::db::datastore::volume::read_only_resources_associated_with_volume;
use sled_agent_client::VolumeConstructionRequest;

// For idempotency, first check if the disk already exists, and if it
Expand Down
3 changes: 1 addition & 2 deletions nexus/db-queries/src/db/datastore/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ mod utilization;
mod v2p_mapping;
mod virtual_provisioning_collection;
mod vmm;
mod volume;
pub mod volume;
mod volume_repair;
mod vpc;
pub mod webhook_delivery;
Expand Down Expand Up @@ -197,7 +197,6 @@ pub use switch_port::SwitchPortSettingsCombinedResult;
pub use user_data_export::*;
pub use virtual_provisioning_collection::StorageType;
pub use vmm::VmmStateUpdateResult;
pub use volume::*;

// Number of unique datasets required to back a region.
// TODO: This should likely turn into a configuration option.
Expand Down
Loading
Loading