fix(volume): fail immediately on activation errors

Author: kvinwang

dstack/crates/dstack-volume/src/bin/dstack-volume.rs

@@ -63,15 +63,13 @@ fn main() -> Result<()> {
         "discovered dstack volumes"
     );
     let mut used = HashSet::new();
-    let mut failures = 0;
     for (index, requested) in compose.verity_volumes.iter().enumerate() {
-        if let Err(err) = activate_requested(index, requested, &volumes, &mut used) {
-            failures += 1;
-            warn!(index, target = %requested.target.display(), error = %format_args!("{err:#}"), "failed to activate required volume");
-        }
-    }
-    if failures != 0 {
-        bail!("failed to activate {failures} required volume(s)");
+        activate_requested(index, requested, &volumes, &mut used).with_context(|| {
+            format!(
+                "failed to activate required volume {index} at {}",
+                requested.target.display()
+            )
+        })?;
     }
     Ok(())
 }

dstack/vmm/src/main_service.rs

@@ -11,12 +11,11 @@ use dstack_types::AppCompose;
 use dstack_vmm_rpc as rpc;
 use dstack_vmm_rpc::vmm_server::{VmmRpc, VmmServer};
 use dstack_vmm_rpc::{
-    AppId, ComposeHash as RpcComposeHash, DhcpLeaseRequest, GatewaySettings, GetInfoResponse,
-    GetMetaResponse, Id, ImageInfo as RpcImageInfo, ImageListResponse, KmsSettings,
-    ListGpusResponse, PublicKeyResponse, PullRegistryImageRequest, RegistryImageInfo,
-    RegistryImageListResponse, ReloadVmsResponse, ResizeVmRequest, ResourcesSettings,
-    StatusRequest, StatusResponse, SvListResponse, SvProcessInfo, UpdateVmRequest, VersionResponse,
-    VmConfiguration,
+    AppId, ComposeHash as RpcComposeHash, GatewaySettings, GetInfoResponse, GetMetaResponse, Id,
+    ImageInfo as RpcImageInfo, ImageListResponse, KmsSettings, ListGpusResponse, PublicKeyResponse,
+    PullRegistryImageRequest, RegistryImageInfo, RegistryImageListResponse, ReloadVmsResponse,
+    ResizeVmRequest, ResourcesSettings, StatusRequest, StatusResponse, SvListResponse,
+    SvProcessInfo, UpdateVmRequest, VersionResponse, VmConfiguration,
 };
 use fs_err as fs;
 use or_panic::ResultOrPanic;
@@ -285,7 +284,6 @@ fn networking_from_proto(proto: &rpc::NetworkingConfig) -> Result<Option<Network
         dhcp_start: String::new(),
         restrict: false,
         netdev: String::new(),
-        forward_service_enabled: false,
     }))
 }
 
@@ -577,9 +575,6 @@ impl VmmRpc for RpcHandler {
             .load_vm(&vm_work_dir, &Default::default(), false)
             .await
             .context("Failed to load VM")?;
-        if request.update_ports {
-            self.app.reconfigure_port_forward(&request.id).await;
-        }
         Ok(Id { id: new_id })
     }
 
@@ -695,7 +690,6 @@ impl VmmRpc for RpcHandler {
                     NetworkingMode::Bridge => "bridge".to_string(),
                     NetworkingMode::Custom => String::new(),
                 },
-                forward_service_enabled: default_networking.forward_service_enabled,
                 default_bridge: default_networking.bridge.clone(),
             }),
         })
@@ -724,11 +718,6 @@ impl VmmRpc for RpcHandler {
         self.app.reload_vms_sync().await
     }
 
-    async fn report_dhcp_lease(self, request: DhcpLeaseRequest) -> Result<()> {
-        self.app.report_dhcp_lease(&request.mac, &request.ip).await;
-        Ok(())
-    }
-
     async fn sv_list(self) -> Result<SvListResponse> {
         use supervisor_client::supervisor::ProcessStatus;
         let list = self.app.supervisor.list().await?;
@@ -991,29 +980,6 @@ mod tests {
         assert!(err.to_string().contains("custom networking mode"));
     }
 
-    #[test]
-    fn multiple_bridges_are_rejected_when_builtin_forwarding_is_enabled() {
-        let mut cvm_config = test_cvm_config();
-        cvm_config.networking.forward_service_enabled = true;
-        let mut request = test_vm_configuration();
-        request.networks = vec![
-            rpc::NetworkingConfig {
-                mode: "bridge".to_string(),
-                bridge_name: "lo".to_string(),
-            },
-            rpc::NetworkingConfig {
-                mode: "bridge".to_string(),
-                bridge_name: "lo".to_string(),
-            },
-        ];
-
-        let err = create_manifest_from_vm_config(request, &cvm_config).unwrap_err();
-
-        assert!(err
-            .to_string()
-            .contains("built-in port forwarding supports only one bridge"));
-    }
-
     #[test]
     fn resolve_volume_source_rejects_escape_symlink_and_qemu_metachars() -> Result<()> {
         let tmp = tempfile::tempdir()?;