Merge pull request #234 from jiangliu/v2.0

Introduce nydus-v2.0/rafsv6

Cargo.toml

@@ -56,6 +56,7 @@ nydus-error = "0.1"
 nydus-utils = { path = "utils" }
 rafs = { path = "rafs", features = ["backend-registry", "backend-oss"] }
 storage = { path = "storage" }
+blobfs = { path = "blobfs", features = ["virtiofs"], optional = true }
 
 [dev-dependencies]
 sendfd = "0.3.3"
@@ -64,7 +65,7 @@ env_logger = "0.8.2"
 
 [features]
 fusedev = ["nydus-utils/fusedev", "fuse-backend-rs/fusedev"]
-virtiofs = ["fuse-backend-rs/vhost-user-fs", "vm-memory", "vhost", "vhost-user-backend", "virtio-queue", "virtio-bindings"]
+virtiofs = ["fuse-backend-rs/vhost-user-fs", "vm-memory", "vhost", "vhost-user-backend", "virtio-queue", "virtio-bindings", "blobfs/virtiofs"]
 
 [workspace]
-members = ["api", "app", "error", "rafs", "storage", "utils"]
+members = ["api", "app", "error", "rafs", "storage", "utils", "blobfs"]

Makefile

@@ -79,7 +79,7 @@ PACKAGES = rafs storage
 ut:
 	echo "Testing packages: ${PACKAGES}"
 	$(foreach var,$(PACKAGES),cargo test $(FUSEDEV_COMMON) -p $(var);)
-	RUST_BACKTRACE=1 cargo test $(FUSEDEV_COMMON) --bins -- --nocapture --test-threads=8
+	TEST_WORKDIR_PREFIX=$(TEST_WORKDIR_PREFIX) RUST_BACKTRACE=1 cargo test $(FUSEDEV_COMMON) --bins -- --nocapture --test-threads=8
 ifdef NYDUS_TEST_VIRTIOFS
 # If virtiofs test must be performed, only run binary part since other package is not affected by feature - virtiofs
 # Use same traget to avoid re-compile for differnt targets like gnu and musl

blobfs/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "blobfs"
+version = "0.1.0"
+authors = ["The Nydus Developers"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+log = "0.4.8"
+serde = { version = ">=1.0.27", features = ["serde_derive", "rc"] }
+serde_json = ">=1.0.9"
+serde_with = { version = "1.6.0", features = ["macros"] }
+libc = "0.2"
+vm-memory = { version = ">=0.2.0" }
+
+rafs = { path = "../rafs" }
+nydus-error = { path = "../error" }
+storage = { path = "../storage", features = ["backend-localfs", "backend-oss", "backend-registry"] }
+
+fuse-backend-rs = { git = "https://github.com/cloud-hypervisor/fuse-backend-rs.git", rev = "afc7b69" }
+
+[features]
+virtiofs = [ "fuse-backend-rs/virtiofs", "vm-memory/backend-mmap"]
+
+[dev-dependencies]
+nydus-app = { path = "../app" }