storage: introduce new backend localdisk in nydusd

The localdisk backend adds support for storing images in disks. In this scenario, each layer of the blob is stored in partitions, and multiple partitions are addressed in the local raw disk via the GUID partition table (GPT), which means that this disk stores the entire image. Signed-off-by: Qinqi Qu <[email protected]>
dragonflyoss · Feb 1, 2023 · b0684c1 · b0684c1
1 parent 33d2499
commit b0684c1
Show file tree

Hide file tree

Showing 13 changed files with 409 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -67,6 +67,7 @@ nydus-rafs = { version = "0.2.0", path = "rafs", features = [
     "backend-registry",
     "backend-oss",
     "backend-s3",
+    "backend-localdisk",
 ] }
 nydus-storage = { version = "0.6.0", path = "storage" }
 nydus-utils = { version = "0.4.0", path = "utils" }

diff --git a/api/src/config.rs b/api/src/config.rs
@@ -230,6 +230,8 @@ pub struct BackendConfigV2 {
     /// Type of storage backend.
     #[serde(rename = "type")]
     pub backend_type: String,
+    /// Configuration for local disk backend.
+    pub localdisk: Option<LocalDiskConfig>,
     /// Configuration for local filesystem backend.
     pub localfs: Option<LocalFsConfig>,
     /// Configuration for OSS backend.
@@ -244,6 +246,14 @@ impl BackendConfigV2 {
     /// Validate storage backend configuration.
     pub fn validate(&self) -> bool {
         match self.backend_type.as_str() {
+            "localdisk" => match self.localdisk.as_ref() {
+                Some(v) => {
+                    if v.device_path.is_empty() {
+                        return false;
+                    }
+                }
+                None => return false,
+            },
             "localfs" => match self.localfs.as_ref() {
                 Some(v) => {
                     if v.blob_file.is_empty() && v.dir.is_empty() {
@@ -282,6 +292,17 @@ impl BackendConfigV2 {
         true
     }
 
+    /// Get configuration information for localdisk
+    pub fn get_localdisk_config(&self) -> Result<&LocalDiskConfig> {
+        if &self.backend_type != "localdisk" {
+            Err(einval!("backend type is not 'localdisk'"))
+        } else {
+            self.localdisk
+                .as_ref()
+                .ok_or_else(|| einval!("no configuration information for localdisk"))
+        }
+    }
+
     /// Get configuration information for localfs
     pub fn get_localfs_config(&self) -> Result<&LocalFsConfig> {
         if &self.backend_type != "localfs" {
@@ -327,6 +348,14 @@ impl BackendConfigV2 {
     }
 }
 
+/// Configuration information for localdisk storage backend.
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
+pub struct LocalDiskConfig {
+    /// Mounted block device path or original localdisk image file path.
+    #[serde(default)]
+    pub device_path: String,
+}
+
 /// Configuration information for localfs storage backend.
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub struct LocalFsConfig {
@@ -889,7 +918,7 @@ struct BackendConfig {
     #[serde(rename = "type")]
     pub backend_type: String,
     /// Configuration for storage backend.
-    /// Possible value: `LocalFsConfig`, `RegistryConfig`, `OssConfig`.
+    /// Possible value: `LocalFsConfig`, `RegistryConfig`, `OssConfig`, `LocalDiskConfig`.
     #[serde(rename = "config")]
     pub backend_config: Value,
 }
@@ -900,13 +929,17 @@ impl TryFrom<&BackendConfig> for BackendConfigV2 {
     fn try_from(value: &BackendConfig) -> std::result::Result<Self, Self::Error> {
         let mut config = BackendConfigV2 {
             backend_type: value.backend_type.clone(),
+            localdisk: None,
             localfs: None,
             oss: None,
             s3: None,
             registry: None,
         };
 
         match value.backend_type.as_str() {
+            "localdisk" => {
+                config.localdisk = Some(serde_json::from_value(value.backend_config.clone())?);
+            }
             "localfs" => {
                 config.localfs = Some(serde_json::from_value(value.backend_config.clone())?);
             }
@@ -1126,7 +1159,7 @@ pub(crate) struct BlobCacheEntryConfig {
     backend_type: String,
     /// Configuration for storage backend, corresponding to `FactoryConfig::BackendConfig::backend_config`.
     ///
-    /// Possible value: `LocalFsConfig`, `RegistryConfig`, `OssConfig`.
+    /// Possible value: `LocalFsConfig`, `RegistryConfig`, `OssConfig`, `LocalDiskConfig`.
     backend_config: Value,
     /// Type of blob cache, corresponding to `FactoryConfig::CacheConfig::cache_type`.
     ///
@@ -1382,6 +1415,15 @@ mod tests {
         assert_eq!(config.alt_dirs, vec!["dir1", "dir2"]);
     }
 
+    #[test]
+    fn test_localdisk_config() {
+        let content = r#"{
+            "device_path": "device_path"
+        }"#;
+        let config: LocalDiskConfig = serde_json::from_str(content).unwrap();
+        assert_eq!(config.device_path, "device_path");
+    }
+
     #[test]
     fn test_backend_config() {
         let config = BackendConfig {

diff --git a/blobfs/Cargo.toml b/blobfs/Cargo.toml
@@ -31,6 +31,7 @@ virtiofs = ["fuse-backend-rs/virtiofs", "nydus-rafs/virtio-fs"]
 baekend-s3 = ["nydus-rafs/backend-s3"]
 backend-oss = ["nydus-rafs/backend-oss"]
 backend-registry = ["nydus-rafs/backend-registry"]
+backend-localdisk = ["nydus-rafs/backend-localdisk"]
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/clib/Cargo.toml b/clib/Cargo.toml
@@ -23,3 +23,4 @@ nydus-rafs = { version = "0.2.0", path = "../rafs" }
 baekend-s3 = ["nydus-rafs/backend-s3"]
 backend-oss = ["nydus-rafs/backend-oss"]
 backend-registry = ["nydus-rafs/backend-registry"]
+backend-localdisk = ["nydus-rafs/backend-localdisk"]
diff --git a/docs/nydusd.md b/docs/nydusd.md
@@ -151,6 +151,25 @@ We are working on enabling cloud-hypervisor support for nydus.
 }
 ```
 
+##### Localdisk Backend
+
+```
+{
+  "device": {
+    "backend": {
+      "type": "localdisk",
+      "config": {
+        // Mounted block device path or original localdisk image file path.
+        "device_path": "/dev/loop1"
+        //"device_path": "/home/user/ubuntu.img"
+      }
+    },
+    ...
+  },
+  ...
+}
+```
+
 ##### OSS backend with blobcache
 
 ```

diff --git a/rafs/Cargo.toml b/rafs/Cargo.toml
@@ -42,6 +42,7 @@ vhost-user-fs = ["fuse-backend-rs/vhost-user-fs"]
 backend-oss = ["nydus-storage/backend-oss"]
 backend-s3 = ["nydus-storage/backend-s3"]
 backend-registry = ["nydus-storage/backend-registry"]
+backend-localdisk = ["nydus-storage/backend-localdisk"]
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/storage/Cargo.toml b/storage/Cargo.toml
@@ -31,6 +31,7 @@ tokio = { version = "1.19.0", features = ["rt", "rt-multi-thread", "sync", "time
 url = { version = "2.1.1", optional = true }
 vm-memory = "0.9"
 fuse-backend-rs = "0.10"
+gpt = { version = "3.0.0", optional = true }
 
 nydus-api = { version = "0.2", path = "../api" }
 nydus-utils = { version = "0.4", path = "../utils", features = ["zran"] }
@@ -43,6 +44,7 @@ tar = "0.4.38"
 regex = "1.7.0"
 
 [features]
+backend-localdisk = ["gpt"]
 backend-localfs = []
 backend-oss = ["base64", "httpdate", "hmac", "sha1", "reqwest", "url"]
 backend-registry = ["base64", "reqwest", "url"]

diff --git a/storage/README.md b/storage/README.md
@@ -1,7 +1,7 @@
 # nydus-storage
 
 The core storage subsystem for [Nydus Image Service](https://nydus.dev/) to:
-- Fetch blob objects from storage backend such as Registry, OSS, S3 and file systems etc.
+- Fetch blob objects from storage backend such as Registry, OSS, S3, local disk and file systems etc.
 - Load data from storage backend on demand.
 - Cache blob objects on local storage.