vmm: Implement backup deletion and restore

Author: kvinwang

Cargo.lock

@@ -121,7 +121,7 @@ fn load_config(config: &PathBuf) -> Result<CertBotConfig> {
     let renew_timeout = Duration::from_secs(config.renew_timeout);
     let bot_config = CertBotConfig::builder()
         .acme_url(config.acme_url)
-        .cert_dir(workdir.backup_dir())
+        .cert_dir(workdir.cert_backup_dir())
         .cert_file(workdir.cert_path())
         .key_file(workdir.key_path())
         .auto_create_account(true)

certbot/cli/src/main.rs

@@ -27,24 +27,24 @@ impl WorkDir {
         self.workdir.join("credentials.json")
     }
 
-    pub fn backup_dir(&self) -> PathBuf {
+    pub fn cert_backup_dir(&self) -> PathBuf {
         self.workdir.join("backup")
     }
 
-    pub fn live_dir(&self) -> PathBuf {
+    pub fn cert_live_dir(&self) -> PathBuf {
         self.workdir.join("live")
     }
 
     pub fn cert_path(&self) -> PathBuf {
-        self.live_dir().join("cert.pem")
+        self.cert_live_dir().join("cert.pem")
     }
 
     pub fn key_path(&self) -> PathBuf {
-        self.live_dir().join("key.pem")
+        self.cert_live_dir().join("key.pem")
     }
 
     pub fn list_certs(&self) -> Result<Vec<PathBuf>> {
-        crate::bot::list_certs(self.backup_dir())
+        crate::bot::list_certs(self.cert_backup_dir())
     }
 
     pub fn acme_account_uri(&self) -> Result<String> {
@@ -58,6 +58,6 @@ impl WorkDir {
     }
 
     pub fn list_cert_public_keys(&self) -> Result<BTreeSet<Vec<u8>>> {
-        crate::bot::list_cert_public_keys(self.backup_dir())
+        crate::bot::list_cert_public_keys(self.cert_backup_dir())
     }
 }

certbot/src/workdir.rs

@@ -209,7 +209,7 @@ impl CertbotConfig {
         let workdir = certbot::WorkDir::new(&self.workdir);
         certbot::CertBotConfig::builder()
             .auto_create_account(true)
-            .cert_dir(workdir.backup_dir())
+            .cert_dir(workdir.cert_backup_dir())
             .cert_file(workdir.cert_path())
             .key_file(workdir.key_path())
             .credentials_file(workdir.account_credentials_path())

gateway/src/config.rs

@@ -44,6 +44,8 @@ hex_fmt.workspace = true
 lspci.workspace = true
 base64.workspace = true
 serde-human-bytes.workspace = true
+serde-duration.workspace = true
+chrono.workspace = true
 
 [dev-dependencies]
 insta.workspace = true

vmm/Cargo.toml

@@ -226,23 +226,39 @@ message GpuInfo {
 
 message BackupDiskRequest {
   // vm id
-  string id = 1;
+  string vm_id = 1;
   // full or incremental
   string level = 2;
 }
 
 message BackupInfo {
-  // filename (e.g., FULL-1694222400-hd1.img)
-  string filename = 1;
+  // Group id
+  string backup_id = 1;
+  // id of the snapshot
+  string snapshot_id = 2;
+  // timestamp
+  string timestamp = 3;
+  // level: full or incremental
+  string level = 4;
   // size of the backup in bytes
-  uint64 size = 2;
+  uint64 size = 5;
 }
 
 message ListBackupsResponse {
-  // list of backups
   repeated BackupInfo backups = 1;
 }
 
+message DeleteBackupRequest {
+  string vm_id = 1;
+  string backup_id = 2;
+}
+
+message RestoreBackupRequest {
+  string vm_id = 1;
+  string backup_id = 2;
+  string snapshot_id = 3;
+}
+
 // Service definition for dstack-vmm
 service Vmm {
   // RPC to create a VM
@@ -287,4 +303,10 @@ service Vmm {
 
   // List backups for a VM
   rpc ListBackups(Id) returns (ListBackupsResponse);
+
+  // Delete a backup
+  rpc DeleteBackup(DeleteBackupRequest) returns (google.protobuf.Empty);
+
+  // Restore a backup
+  rpc RestoreBackup(RestoreBackupRequest) returns (google.protobuf.Empty);
 }