s/boot_device/boot_disk/g

Author: iximeow

common/src/api/external/mod.rs

@@ -1187,8 +1187,8 @@ pub struct Instance {
     /// RFC1035-compliant hostname for the Instance.
     pub hostname: String,
 
-    /// the ID of the device used to boot this Instance, if a specific one is assigned.
-    pub boot_device_id: Option<Uuid>,
+    /// the ID of the disk used to boot this Instance, if a specific one is assigned.
+    pub boot_disk_id: Option<Uuid>,
 
     #[serde(flatten)]
     pub runtime: InstanceRuntimeState,

nexus/db-model/src/instance.rs

@@ -63,9 +63,9 @@ pub struct Instance {
     #[diesel(column_name = auto_restart_policy)]
     pub auto_restart_policy: Option<InstanceAutoRestart>,
 
-    /// The primary boot device for this instance.
-    #[diesel(column_name = boot_device)]
-    pub boot_device: Option<Uuid>,
+    /// The primary boot disk for this instance.
+    #[diesel(column_name = boot_disk)]
+    pub boot_disk: Option<Uuid>,
 
     #[diesel(embed)]
     pub runtime_state: InstanceRuntimeState,
@@ -117,9 +117,9 @@ impl Instance {
             // TODO(eliza): allow this to be configured via the instance-create
             // params...
             auto_restart_policy: None,
-            // Intentionally ignore `params.boot_device` here: we can't set
-            // `boot_device` until the referenced device is attached.
-            boot_device: None,
+            // Intentionally ignore `params.boot_disk` here: we can't set
+            // `boot_disk` until the referenced disk is attached.
+            boot_disk: None,
             runtime_state,
 
             updater_gen: Generation::new(),
@@ -235,6 +235,6 @@ impl InstanceRuntimeState {
 #[derive(Clone, Debug, AsChangeset, Serialize, Deserialize)]
 #[diesel(table_name = instance, treat_none_as_null = true)]
 pub struct InstanceUpdate {
-    #[diesel(column_name = boot_device)]
-    pub boot_device: Option<Uuid>,
+    #[diesel(column_name = boot_disk)]
+    pub boot_disk: Option<Uuid>,
 }

nexus/db-model/src/schema.rs

@@ -408,7 +408,7 @@ table! {
         memory -> Int8,
         hostname -> Text,
         auto_restart_policy -> Nullable<crate::InstanceAutoRestartEnum>,
-        boot_device -> Nullable<Uuid>,
+        boot_disk -> Nullable<Uuid>,
         time_state_updated -> Timestamptz,
         state_generation -> Int8,
         active_propolis_id -> Nullable<Uuid>,

nexus/db-model/src/schema_versions.rs

@@ -29,7 +29,7 @@ static KNOWN_VERSIONS: Lazy<Vec<KnownVersion>> = Lazy::new(|| {
         // |  leaving the first copy as an example for the next person.
         // v
         // KnownVersion::new(next_int, "unique-dirname-with-the-sql-files"),
-        KnownVersion::new(98, "add-instance-boot-device"),
+        KnownVersion::new(98, "add-instance-boot-disk"),
         KnownVersion::new(97, "lookup-region-snapshot-by-region-id"),
         KnownVersion::new(96, "inv-dataset"),
         KnownVersion::new(95, "turn-boot-on-fault-into-auto-restart"),

nexus/db-queries/src/db/datastore/disk.rs

@@ -337,8 +337,8 @@ impl DataStore {
                         .eq_any(ok_to_detach_instance_states)
                         .and(instance::dsl::active_propolis_id.is_null())
                         .and(
-                            instance::dsl::boot_device.ne(authz_disk.id())
-                                .or(instance::dsl::boot_device.is_null())
+                            instance::dsl::boot_disk.ne(authz_disk.id())
+                                .or(instance::dsl::boot_disk.is_null())
                         )),
             disk::table
                 .into_boxed()
@@ -392,7 +392,7 @@ impl DataStore {
                                 // Ok-to-be-detached instance states:
                                 api::external::InstanceState::Creating |
                                 api::external::InstanceState::Stopped => {
-                                    if collection.boot_device == Some(authz_disk.id()) {
+                                    if collection.boot_disk == Some(authz_disk.id()) {
                                         return Err(Error::conflict(
                                             "boot disk cannot be detached"
                                         ));

nexus/db-queries/src/db/datastore/instance.rs

@@ -206,7 +206,7 @@ impl From<InstanceAndActiveVmm> for external::Instance {
                 .hostname
                 .parse()
                 .expect("found invalid hostname in the database"),
-            boot_device_id: value.instance.boot_device.into(),
+            boot_disk_id: value.instance.boot_disk.into(),
             runtime: external::InstanceRuntimeState {
                 run_state: value.effective_state(),
                 time_run_state_updated,
@@ -906,12 +906,12 @@ impl DataStore {
                     // * Allow reconfiguration in NoVmm because there is no VMM
                     //   to contend with.
                     // * Allow reconfiguration in Failed to allow changing the
-                    //   boot device of a failed instance and free its boot disk
+                    //   boot disk of a failed instance and free its boot disk
                     //   for detach.
                     // * Allow reconfiguration in Creating because one of the
                     //   last steps of instance creation, while the instance is
                     //   still in Creating, is to reconfigure the instance to
-                    //   the desired boot device.
+                    //   the desired boot disk.
                     let ok_to_reconfigure_instance_states = vec![
                         InstanceState::NoVmm,
                         InstanceState::Failed,
@@ -940,7 +940,7 @@ impl DataStore {
                         }
                     }
 
-                    if let Some(disk_id) = update.boot_device.clone() {
+                    if let Some(disk_id) = update.boot_disk.clone() {
                         // Ensure the disk is currently attached before updating
                         // the database.
                         let expected_state = api::external::DiskState::Attached(
@@ -972,7 +972,7 @@ impl DataStore {
                     // here.
                     //
                     // NOTE: from this point forward it is OK if we update the
-                    // instance's `boot_device` column with the updated value
+                    // instance's `boot_disk` column with the updated value
                     // again. It will have already been assigned with constraint
                     // checking performed above, so updates will just be
                     // repetitive, not harmful.
@@ -1774,7 +1774,7 @@ mod tests {
                             params::InstanceNetworkInterfaceAttachment::None,
                         external_ips: Vec::new(),
                         disks: Vec::new(),
-                        boot_device: None,
+                        boot_disk: None,
                         ssh_public_keys: None,
                         start: false,
                     },

nexus/db-queries/src/db/datastore/migration.rs

@@ -234,7 +234,7 @@ mod tests {
                             params::InstanceNetworkInterfaceAttachment::None,
                         external_ips: Vec::new(),
                         disks: Vec::new(),
-                        boot_device: None,
+                        boot_disk: None,
                         ssh_public_keys: None,
                         start: false,
                     },

nexus/db-queries/src/db/datastore/virtual_provisioning_collection.rs

@@ -454,7 +454,7 @@ mod test {
                             params::InstanceNetworkInterfaceAttachment::None,
                         external_ips: Vec::new(),
                         disks: Vec::new(),
-                        boot_device: None,
+                        boot_disk: None,
                         ssh_public_keys: None,
                         start: false,
                     },

nexus/db-queries/src/db/datastore/vpc.rs

@@ -2836,7 +2836,7 @@ mod tests {
                             params::InstanceNetworkInterfaceAttachment::None,
                         external_ips: vec![],
                         disks: vec![],
-                        boot_device: None,
+                        boot_disk: None,
                         ssh_public_keys: None,
                         start: false,
                     },

nexus/src/app/instance.rs

@@ -304,7 +304,7 @@ impl super::Nexus {
         let (.., authz_project, authz_instance) =
             instance_lookup.lookup_for(authz::Action::Modify).await?;
 
-        let boot_device = match params.boot_device.clone() {
+        let boot_disk = match params.boot_disk.clone() {
             Some(disk) => {
                 let selector = params::DiskSelector {
                     project: match &disk {
@@ -323,7 +323,7 @@ impl super::Nexus {
             None => None,
         };
 
-        let update = InstanceUpdate { boot_device };
+        let update = InstanceUpdate { boot_disk };
         self.datastore()
             .reconfigure_instance(opctx, &authz_instance, update)
             .await
@@ -467,12 +467,12 @@ impl super::Nexus {
         }
 
         // It is deceptively inconvenient to do an early check that the boot
-        // device is valid here! We accept boot device by name or ID, but disk
+        // disk is valid here! We accept boot disk by name or ID, but disk
         // creation and attachment requests as part of instance creation all
-        // require the disk name. So if the boot device is an ID, we would need
-        // to look up all attachment requests to compare the named device and
-        // to-be-attached devices. Instead, leave this for the other end of the
-        // saga when we'd go to set the boot device.
+        // require the disk name. So if the boot disk is an ID, we would need
+        // to look up all attachment requests to compare the named disk and
+        // to-be-attached disks. Instead, leave this for the other end of the
+        // saga when we'd go to set the boot disk.
 
         let saga_params = sagas::instance_create::Params {
             serialized_authn: authn::saga::Serialized::for_opctx(opctx),
@@ -1016,7 +1016,7 @@ impl super::Nexus {
             )
             .await?;
 
-        let mut boot_device_name = None;
+        let mut boot_disk_name = None;
 
         let mut disk_reqs = vec![];
         for disk in &disks {
@@ -1054,8 +1054,8 @@ impl super::Nexus {
 
             // Propolis wants the name of the boot disk rather than ID, because we send names
             // rather than IDs in the disk requsts as assembled below.
-            if db_instance.boot_device == Some(disk.id()) {
-                boot_device_name = Some(disk.name().to_string());
+            if db_instance.boot_disk == Some(disk.id()) {
+                boot_disk_name = Some(disk.name().to_string());
             }
 
             disk_reqs.push(sled_agent_client::types::DiskRequest {
@@ -1072,23 +1072,23 @@ impl super::Nexus {
 
         // This should never occur: when setting the boot disk we ensure it is
         // attached, and when detaching a disk we ensure it is not the boot
-        // disk. If this error is seen, the instance somehow had a boot device
-        // that was not an attached disk anyway.
+        // disk. If this error is seen, the instance somehow had a boot disk
+        // that was not attached anyway.
         //
         // When Propolis accepts an ID rather than name, and we don't need to
         // look up a name when assembling the Propolis request, we might as well
         // remove this check; we can just pass the ID and rely on Propolis' own
-        // check that the boot device is attached.
-        if let Some(instance_boot_device) = db_instance.boot_device.as_ref() {
-            if boot_device_name.is_none() {
-                error!(self.log, "instance boot device is not attached";
-                   "boot_device" => ?instance_boot_device,
+        // check that the boot disk is attached.
+        if let Some(instance_boot_disk) = db_instance.boot_disk.as_ref() {
+            if boot_disk_name.is_none() {
+                error!(self.log, "instance boot disk is not attached";
+                   "boot_disk" => ?instance_boot_disk,
                    "instance id" => %db_instance.id());
 
                 return Err(InstanceStateChangeError::Other(Error::internal_error(&format!(
-                    "instance {} has boot device {:?} but it is not an attached disk",
+                    "instance {} has boot disk {:?} but it is not attached",
                     db_instance.id(),
-                    db_instance.boot_device.as_ref(),
+                    db_instance.boot_disk.as_ref(),
                 ))));
             }
         }
@@ -1240,7 +1240,7 @@ impl super::Nexus {
                 search_domains: Vec::new(),
             },
             disks: disk_reqs,
-            boot_order: boot_device_name.map(|v| vec![v]),
+            boot_order: boot_disk_name.map(|v| vec![v]),
             cloud_init_bytes: Some(base64::Engine::encode(
                 &base64::engine::general_purpose::STANDARD,
                 db_instance.generate_cidata(&ssh_keys)?,
@@ -2321,7 +2321,7 @@ mod tests {
             network_interfaces: InstanceNetworkInterfaceAttachment::None,
             external_ips: vec![],
             disks: vec![],
-            boot_device: None,
+            boot_disk: None,
             ssh_public_keys: None,
             start: false,
         };