Merge pull request #274 from amshinde/1.10.5-branch-bump

# Kata Containers 1.10.5

.github/workflows/PR-wip-checks.yaml

@@ -1,21 +0,0 @@
-name: Pull request WIP checks
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - edited
-      - labeled
-      - unlabeled
-
-jobs:
-  pr_wip_check:
-    runs-on: ubuntu-latest
-    name: WIP Check
-    steps:
-    - name: WIP Check
-      uses: tim-actions/wip-check@1c2a1ca6c110026b3e2297bb2ef39e1747b5a755
-      with:
-        labels: '["do-not-merge", "wip", "rfc"]'
-        keywords: '["WIP", "wip", "RFC", "rfc", "dnm", "DNM", "do-not-merge"]'

.github/workflows/dco-check.yaml

@@ -1,22 +0,0 @@
-name: DCO check
-on: 
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-
-jobs:
-  dco_check_job:
-    runs-on: ubuntu-latest
-    name: DCO Check
-    steps:
-    - name: Get PR Commits
-      id: 'get-pr-commits'
-      uses: tim-actions/get-pr-commits@ed97a21c3f83c3417e67a4733ea76887293a2c8f
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-    - name: DCO Check
-      uses: tim-actions/dco@2fd0504dc0d27b33f542867c300c60840c6dcb20
-      with:
-        commits: ${{ steps.get-pr-commits.outputs.commits }}

.github/workflows/gather-artifacts.sh

@@ -14,5 +14,5 @@ do
     tar -xvf $c
 done
 
-tar cvfJ ../kata-static.tar.xz ./opt
+tar cfJ ../kata-static.tar.xz ./opt
 popd >>/dev/null

.github/workflows/main.yaml

@@ -1,4 +1,3 @@
-name: Publish release tarball
 on: 
   push: 
     tags:
@@ -340,10 +339,7 @@ jobs:
       - name: push static tarball to github
         run: |
           tag=$(echo $GITHUB_REF | cut -d/ -f3-)
-          tarball="kata-static-$tag-x86_64.tar.xz"
-          repo="https://github.com/kata-containers/runtime.git"
-          mv release-candidate/kata-static.tar.xz "release-candidate/${tarball}"
-          git clone "${repo}"
+          mv release-candidate/kata-static.tar.xz release-candidate/kata-static-$tag-x86_64.tar.xz
+          git clone https://github.com/kata-containers/runtime.git
           cd runtime
-          echo "uploading asset '${tarball}' to '${repo}' tag: ${tag}"
-          GITHUB_TOKEN=${{ secrets.GIT_UPLOAD_TOKEN }} hub release edit -m "" -a "../release-candidate/${tarball}" "${tag}"
+          GITHUB_TOKEN=${{ secrets.GIT_UPLOAD_TOKEN }} hub release edit -m "" -a ../release-candidate/kata-static-${tag}-x86_64.tar.xz "${tag}"

VERSION

@@ -1 +1 @@
-1.12.0
+1.10.5

ci/lib.sh

@@ -28,6 +28,12 @@ run_static_checks()
 	bash "$tests_repo_dir/.ci/static-checks.sh" "github.com/kata-containers/kata-containers"
 }
 
+run_rust_test()
+{
+	clone_tests_repo
+	bash "$tests_repo_dir/.ci/rust-test.sh"
+}
+
 run_go_test()
 {
 	clone_tests_repo

src/agent/.cargo/config

@@ -1,15 +0,0 @@
-## Copyright (c) 2020 ARM Limited
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-
-[target.aarch64-unknown-linux-musl]
-## Only setting linker with `aarch64-linux-musl-gcc`, the
-## `rust-agent` could be totally statically linked.
-linker = "aarch64-linux-musl-gcc"
-
-## The __addtf3, __subtf3 and __multf3 symbols are used by aarch64-musl,
-## but are not provided by rust compiler-builtins.
-## For now, the only functional workaround accepted by rust communities
-## is to get them from libgcc.
-rustflags = [ "-C", "link-arg=-lgcc" ]

src/agent/Cargo.toml

@@ -6,37 +6,28 @@ edition = "2018"
 
 [dependencies]
 oci = { path = "oci" }
-logging = { path = "logging" }
 rustjail = { path = "rustjail" }
 protocols = { path = "protocols" }
 netlink = { path = "netlink" }
 lazy_static = "1.3.0"
 error-chain = "0.12.1"
 grpcio = { git="https://github.com/alipay/grpc-rs", branch="rust_agent" }
-protobuf = "=2.6.1"
+protobuf = "2.6.1"
 futures = "0.1.27"
 libc = "0.2.58"
-nix = "0.17.0"
+nix = "0.14.1"
 prctl = "1.0.0"
 serde_json = "1.0.39"
 signal-hook = "0.1.9"
 scan_fmt = "0.2.3"
-scopeguard = "1.0.0"
 regex = "1"
 # slog:
 # - Dynamic keys required to allow HashMap keys to be slog::Serialized.
 # - The 'max_*' features allow changing the log level at runtime
 #   (by stopping the compiler from removing log calls).
 slog = { version = "2.5.2", features = ["dynamic-keys", "max_level_trace", "release_max_level_info"] }
+slog-json = "2.3.0"
+slog-async = "2.3.0"
 slog-scope = "4.1.2"
 # for testing
 tempfile = "3.1.0"
-
-[workspace]
-members = [
-    "logging",
-    "netlink",
-    "oci",
-    "protocols",
-    "rustjail",
-]

src/agent/Makefile

@@ -34,22 +34,6 @@ TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)
 DESTDIR :=
 BINDIR := /usr/bin
 
-# Define if agent will be installed as init
-INIT := no
-
-# Path to systemd unit directory if installed as not init.
-UNIT_DIR := /usr/lib/systemd/system
-
-GENERATED_FILES :=
-
-ifeq ($(INIT),no)
-    # Unit file to start kata agent in systemd systems
-    UNIT_FILES = kata-agent.service
-    GENERATED_FILES := $(UNIT_FILES)
-    # Target to be reached in systemd services
-    UNIT_FILES += kata-containers.target
-endif
-
 # Display name of command and it's version (or a message if not available).
 #
 # Arguments:
@@ -63,47 +47,28 @@ define get_toolchain_version
 $(shell printf "%s: %s\\n" "toolchain" "$(or $(shell rustup show active-toolchain 2>/dev/null), (unknown))")
 endef
 
-define INSTALL_FILE
-	install -D -m 644 $1 $(DESTDIR)$2/$1 || exit 1;
-endef
-
 default: $(TARGET) show-header
 
 $(TARGET): $(TARGET_PATH)
 
 $(TARGET_PATH): $(SOURCES) | show-summary
-	@rustup default 1.42.0
-	@rustup toolchain install 1.42.0-musl
-	@rustup target add $(ARCH)-unknown-linux-musl
 	@cargo build --target $(TRIPLE)
 
 show-header:
 	@printf "%s - version %s (commit %s)\n\n" "$(TARGET)" "$(VERSION)" "$(COMMIT_MSG)"
 
-$(GENERATED_FILES): %: %.in
-	@sed \
-		-e 's|[@]bindir[@]|$(BINDIR)|g' \
-		-e 's|[@]kata-agent[@]|$(TARGET)|g' \
-		"$<" > "$@"
-
-install: build-service
+install:
 	@install -D $(TARGET_PATH) $(DESTDIR)/$(BINDIR)/$(TARGET)
 
 clean:
 	@cargo clean
 
 check:
-	@cargo test --all --target $(TRIPLE)
+	@cargo test --target $(TRIPLE)
 
 run:
 	@cargo run --target $(TRIPLE)
 
-build-service: $(GENERATED_FILES)
-ifeq ($(INIT),no)
-	@echo "Installing systemd unit files..."
-	$(foreach f,$(UNIT_FILES),$(call INSTALL_FILE,$f,$(UNIT_DIR)))
-endif
-
 show-summary: show-header
 	@printf "project:\n"
 	@printf "  name: $(PROJECT_NAME)\n"

src/agent/kata-agent.service.in

@@ -1,22 +0,0 @@
-#
-# Copyright (c) 2018-2019 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-[Unit]
-Description=Kata Containers Agent
-Documentation=https://github.com/kata-containers/kata-containers
-Wants=kata-containers.target
-
-[Service]
-# Send agent output to tty to allow capture debug logs
-# from a VM vsock port
-StandardOutput=tty
-Type=simple
-ExecStart=@bindir@/@kata-agent@
-LimitNOFILE=infinity
-# ExecStop is required for static agent tracing; in all other scenarios
-# the runtime handles shutting down the VM.
-ExecStop=/bin/sync ; /usr/bin/systemctl --force poweroff
-FailureAction=poweroff

src/agent/kata-containers.target

@@ -1,15 +0,0 @@
-#
-# Copyright (c) 2018-2019 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-[Unit]
-Description=Kata Containers Agent Target
-Requires=basic.target
-Requires=tmp.mount
-Wants=chronyd.service
-Requires=kata-agent.service
-Conflicts=rescue.service rescue.target
-After=basic.target rescue.service rescue.target
-AllowIsolate=yes

src/agent/logging/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "logging"
-version = "0.1.0"
-authors = ["Tim Zhang <tim@hyper.sh>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-serde_json = "1.0.39"
-# slog:
-# - Dynamic keys required to allow HashMap keys to be slog::Serialized.
-# - The 'max_*' features allow changing the log level at runtime
-#   (by stopping the compiler from removing log calls).
-slog = { version = "2.5.2", features = ["dynamic-keys", "max_level_trace", "release_max_level_info"] }
-slog-json = "2.3.0"
-slog-async = "2.3.0"
-slog-scope = "4.1.2"
-# for testing
-tempfile = "3.1.0"

src/agent/netlink/Cargo.toml

@@ -8,8 +8,8 @@ edition = "2018"
 
 [dependencies]
 libc = "0.2.58"
-nix = "0.17.0"
-protobuf = "=2.6.1"
+nix = "0.14.1"
+protobuf = "2.6.1"
 rustjail = { path = "../rustjail" }
 protocols = { path = "../protocols" }
 slog = { version = "2.5.2", features = ["dynamic-keys", "max_level_trace", "release_max_level_info"] }

src/agent/protocols/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2018"
 
 [dependencies]
 grpcio = { git="https://github.com/alipay/grpc-rs", branch="rust_agent" }
-protobuf = "=2.6.1"
+protobuf = "2.6.1"
 futures = "0.1.27"

src/agent/rustjail/Cargo.toml

@@ -12,12 +12,12 @@ serde_derive = "1.0.91"
 oci = { path = "../oci" }
 protocols = { path ="../protocols" }
 caps = "0.3.0"
-nix = "0.17.0"
+nix = "0.14.1"
 scopeguard = "1.0.0"
 prctl = "1.0.0"
 lazy_static = "1.3.0"
 libc = "0.2.58"
-protobuf = "=2.6.1"
+protobuf = "2.6.1"
 slog = "2.5.2"
 slog-scope = "4.1.2"
 scan_fmt = "0.2"

src/agent/rustjail/src/capabilities.rs

@@ -9,12 +9,10 @@
 use lazy_static;
 
 use crate::errors::*;
-use crate::log_child;
-use crate::sync::write_count;
 use caps::{self, CapSet, Capability, CapsHashSet};
-use oci::LinuxCapabilities;
+use protocols::oci::LinuxCapabilities;
+use slog::Logger;
 use std::collections::HashMap;
-use std::os::unix::io::RawFd;
 
 lazy_static! {
     pub static ref CAPSMAP: HashMap<String, Capability> = {
@@ -78,14 +76,14 @@ lazy_static! {
     };
 }
 
-fn to_capshashset(cfd_log: RawFd, caps: &[String]) -> CapsHashSet {
+fn to_capshashset(logger: &Logger, caps: &[String]) -> CapsHashSet {
     let mut r = CapsHashSet::new();
 
     for cap in caps.iter() {
         let c = CAPSMAP.get(cap);
 
         if c.is_none() {
-            log_child!(cfd_log, "{} is not a cap", cap);
+            warn!(logger, "{} is not a cap", cap);
             continue;
         }
 
@@ -100,35 +98,37 @@ pub fn reset_effective() -> Result<()> {
     Ok(())
 }
 
-pub fn drop_priviledges(cfd_log: RawFd, caps: &LinuxCapabilities) -> Result<()> {
+pub fn drop_priviledges(logger: &Logger, caps: &LinuxCapabilities) -> Result<()> {
+    let logger = logger.new(o!("subsystem" => "capabilities"));
+
     let all = caps::all();
 
-    for c in all.difference(&to_capshashset(cfd_log, caps.bounding.as_ref())) {
+    for c in all.difference(&to_capshashset(&logger, caps.Bounding.as_ref())) {
         caps::drop(None, CapSet::Bounding, *c)?;
     }
 
     caps::set(
         None,
         CapSet::Effective,
-        to_capshashset(cfd_log, caps.effective.as_ref()),
+        to_capshashset(&logger, caps.Effective.as_ref()),
     )?;
     caps::set(
         None,
         CapSet::Permitted,
-        to_capshashset(cfd_log, caps.permitted.as_ref()),
+        to_capshashset(&logger, caps.Permitted.as_ref()),
     )?;
     caps::set(
         None,
         CapSet::Inheritable,
-        to_capshashset(cfd_log, caps.inheritable.as_ref()),
+        to_capshashset(&logger, caps.Inheritable.as_ref()),
     )?;
 
     if let Err(_) = caps::set(
         None,
         CapSet::Ambient,
-        to_capshashset(cfd_log, caps.ambient.as_ref()),
+        to_capshashset(&logger, caps.Ambient.as_ref()),
     ) {
-        log_child!(cfd_log, "failed to set ambient capability");
+        warn!(logger, "failed to set ambient capability");
     }
 
     Ok(())

src/agent/rustjail/src/cgroups/fs/mod.rs

@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 //
+
 use crate::cgroups::FreezerState;
 use crate::cgroups::Manager as CgroupManager;
 use crate::container::DEFAULT_DEVICES;
@@ -9,16 +10,15 @@ use crate::errors::*;
 use lazy_static;
 use libc::{self, pid_t};
 use nix::errno::Errno;
-use oci::{LinuxDeviceCgroup, LinuxResources, LinuxThrottleDevice, LinuxWeightDevice};
 use protobuf::{CachedSize, RepeatedField, SingularPtrField, UnknownFields};
 use protocols::agent::{
     BlkioStats, BlkioStatsEntry, CgroupStats, CpuStats, CpuUsage, HugetlbStats, MemoryData,
     MemoryStats, PidsStats, ThrottlingData,
 };
+use protocols::oci::{LinuxDeviceCgroup, LinuxResources, LinuxThrottleDevice, LinuxWeightDevice};
 use regex::Regex;
 use std::collections::HashMap;
 use std::fs;
-use std::path::Path;
 
 // Convenience macro to obtain the scope logger
 macro_rules! sl {
@@ -57,51 +57,63 @@ lazy_static! {
     pub static ref DEFAULT_ALLOWED_DEVICES: Vec<LinuxDeviceCgroup> = {
         let mut v = Vec::new();
         v.push(LinuxDeviceCgroup {
-            allow: true,
-            r#type: "c".to_string(),
-            major: Some(WILDCARD),
-            minor: Some(WILDCARD),
-            access: "m".to_string(),
+            Allow: true,
+            Type: "c".to_string(),
+            Major: WILDCARD,
+            Minor: WILDCARD,
+            Access: "m".to_string(),
+            unknown_fields: UnknownFields::default(),
+            cached_size: CachedSize::default(),
         });
 
         v.push(LinuxDeviceCgroup {
-            allow: true,
-            r#type: "b".to_string(),
-            major: Some(WILDCARD),
-            minor: Some(WILDCARD),
-            access: "m".to_string(),
+            Allow: true,
+            Type: "b".to_string(),
+            Major: WILDCARD,
+            Minor: WILDCARD,
+            Access: "m".to_string(),
+            unknown_fields: UnknownFields::default(),
+            cached_size: CachedSize::default(),
         });
 
         v.push(LinuxDeviceCgroup {
-            allow: true,
-            r#type: "c".to_string(),
-            major: Some(5),
-            minor: Some(1),
-            access: "rwm".to_string(),
+            Allow: true,
+            Type: "c".to_string(),
+            Major: 5,
+            Minor: 1,
+            Access: "rwm".to_string(),
+            unknown_fields: UnknownFields::default(),
+            cached_size: CachedSize::default(),
         });
 
         v.push(LinuxDeviceCgroup {
-            allow: true,
-            r#type: "c".to_string(),
-            major: Some(136),
-            minor: Some(WILDCARD),
-            access: "rwm".to_string(),
+            Allow: true,
+            Type: "c".to_string(),
+            Major: 136,
+            Minor: WILDCARD,
+            Access: "rwm".to_string(),
+            unknown_fields: UnknownFields::default(),
+            cached_size: CachedSize::default(),
         });
 
         v.push(LinuxDeviceCgroup {
-            allow: true,
-            r#type: "c".to_string(),
-            major: Some(5),
-            minor: Some(2),
-            access: "rwm".to_string(),
+            Allow: true,
+            Type: "c".to_string(),
+            Major: 5,
+            Minor: 2,
+            Access: "rwm".to_string(),
+            unknown_fields: UnknownFields::default(),
+            cached_size: CachedSize::default(),
         });
 
         v.push(LinuxDeviceCgroup {
-            allow: true,
-            r#type: "c".to_string(),
-            major: Some(10),
-            minor: Some(200),
-            access: "rwm".to_string(),
+            Allow: true,
+            Type: "c".to_string(),
+            Major: 10,
+            Minor: 200,
+            Access: "rwm".to_string(),
+            unknown_fields: UnknownFields::default(),
+            cached_size: CachedSize::default(),
         });
 
         v
@@ -207,7 +219,7 @@ fn parse_size(s: &str, m: &HashMap<String, u128>) -> Result<u128> {
 
 fn custom_size(mut size: f64, base: f64, m: &Vec<String>) -> String {
     let mut i = 0;
-    while size >= base && i < m.len() - 1 {
+    while size > base {
         size /= base;
         i += 1;
     }
@@ -307,6 +319,7 @@ where
     T: ToString,
 {
     let p = format!("{}/{}", dir, file);
+    info!(sl!(), "{}", p.as_str());
     fs::write(p.as_str(), v.to_string().as_bytes())?;
     Ok(())
 }
@@ -406,10 +419,10 @@ impl Subsystem for CpuSet {
         let mut cpus: &str = "";
         let mut mems: &str = "";
 
-        if r.cpu.is_some() {
-            let cpu = r.cpu.as_ref().unwrap();
-            cpus = cpu.cpus.as_str();
-            mems = cpu.mems.as_str();
+        if r.CPU.is_some() {
+            let cpu = r.CPU.as_ref().unwrap();
+            cpus = cpu.Cpus.as_str();
+            mems = cpu.Mems.as_str();
         }
 
         // For updatecontainer, just set the new value
@@ -453,25 +466,17 @@ impl Subsystem for Cpu {
     }
 
     fn set(&self, dir: &str, r: &LinuxResources, _update: bool) -> Result<()> {
-        if r.cpu.is_none() {
+        if r.CPU.is_none() {
             return Ok(());
         }
 
-        let cpu = r.cpu.as_ref().unwrap();
+        let cpu = r.CPU.as_ref().unwrap();
 
-        try_write_nonzero(
-            dir,
-            CPU_RT_PERIOD_US,
-            cpu.realtime_period.unwrap_or(0) as i128,
-        )?;
-        try_write_nonzero(
-            dir,
-            CPU_RT_RUNTIME_US,
-            cpu.realtime_runtime.unwrap_or(0) as i128,
-        )?;
-        write_nonzero(dir, CPU_SHARES, cpu.shares.unwrap_or(0) as i128)?;
-        write_nonzero(dir, CPU_CFS_QUOTA_US, cpu.quota.unwrap_or(0) as i128)?;
-        write_nonzero(dir, CPU_CFS_PERIOD_US, cpu.period.unwrap_or(0) as i128)?;
+        try_write_nonzero(dir, CPU_RT_PERIOD_US, cpu.RealtimePeriod as i128)?;
+        try_write_nonzero(dir, CPU_RT_RUNTIME_US, cpu.RealtimeRuntime as i128)?;
+        write_nonzero(dir, CPU_SHARES, cpu.Shares as i128)?;
+        write_nonzero(dir, CPU_CFS_QUOTA_US, cpu.Quota as i128)?;
+        write_nonzero(dir, CPU_CFS_PERIOD_US, cpu.Period as i128)?;
 
         Ok(())
     }
@@ -594,24 +599,24 @@ impl CpuAcct {
 }
 
 fn write_device(d: &LinuxDeviceCgroup, dir: &str) -> Result<()> {
-    let file = if d.allow { DEVICES_ALLOW } else { DEVICES_DENY };
+    let file = if d.Allow { DEVICES_ALLOW } else { DEVICES_DENY };
 
-    let major = if d.major.unwrap_or(0) == WILDCARD {
+    let major = if d.Major == WILDCARD {
         "*".to_string()
     } else {
-        d.major.unwrap_or(0).to_string()
+        d.Major.to_string()
     };
 
-    let minor = if d.minor.unwrap_or(0) == WILDCARD {
+    let minor = if d.Minor == WILDCARD {
         "*".to_string()
     } else {
-        d.minor.unwrap_or(0).to_string()
+        d.Minor.to_string()
     };
 
-    let t = if d.r#type.is_empty() {
+    let t = if d.Type.is_empty() {
         "a"
     } else {
-        d.r#type.as_str()
+        d.Type.as_str()
     };
 
     let v = format!(
@@ -619,7 +624,7 @@ fn write_device(d: &LinuxDeviceCgroup, dir: &str) -> Result<()> {
         t,
         major.as_str(),
         minor.as_str(),
-        d.access.as_str()
+        d.Access.as_str()
     );
 
     info!(sl!(), "{}", v.as_str());
@@ -633,17 +638,19 @@ impl Subsystem for Devices {
     }
 
     fn set(&self, dir: &str, r: &LinuxResources, _update: bool) -> Result<()> {
-        for d in r.devices.iter() {
+        for d in r.Devices.iter() {
             write_device(d, dir)?;
         }
 
         for d in DEFAULT_DEVICES.iter() {
             let td = LinuxDeviceCgroup {
-                allow: true,
-                r#type: d.r#type.clone(),
-                major: Some(d.major),
-                minor: Some(d.minor),
-                access: "rwm".to_string(),
+                Allow: true,
+                Type: d.Type.clone(),
+                Major: d.Major,
+                Minor: d.Minor,
+                Access: "rwm".to_string(),
+                unknown_fields: UnknownFields::default(),
+                cached_size: CachedSize::default(),
             };
 
             write_device(&td, dir)?;
@@ -684,34 +691,30 @@ impl Subsystem for Memory {
     }
 
     fn set(&self, dir: &str, r: &LinuxResources, update: bool) -> Result<()> {
-        if r.memory.is_none() {
+        if r.Memory.is_none() {
             return Ok(());
         }
 
-        let memory = r.memory.as_ref().unwrap();
+        let memory = r.Memory.as_ref().unwrap();
         // initialize kmem limits for accounting
         if !update {
             try_write(dir, KMEM_LIMIT, 1)?;
             try_write(dir, KMEM_LIMIT, -1)?;
         }
 
-        write_nonzero(dir, MEMORY_LIMIT, memory.limit.unwrap_or(0) as i128)?;
-        write_nonzero(
-            dir,
-            MEMORY_SOFT_LIMIT,
-            memory.reservation.unwrap_or(0) as i128,
-        )?;
+        write_nonzero(dir, MEMORY_LIMIT, memory.Limit as i128)?;
+        write_nonzero(dir, MEMORY_SOFT_LIMIT, memory.Reservation as i128)?;
 
-        try_write_nonzero(dir, MEMSW_LIMIT, memory.swap.unwrap_or(0) as i128)?;
-        try_write_nonzero(dir, KMEM_LIMIT, memory.kernel.unwrap_or(0) as i128)?;
+        try_write_nonzero(dir, MEMSW_LIMIT, memory.Swap as i128)?;
+        try_write_nonzero(dir, KMEM_LIMIT, memory.Kernel as i128)?;
 
-        write_nonzero(dir, KMEM_TCP_LIMIT, memory.kernel_tcp.unwrap_or(0) as i128)?;
+        write_nonzero(dir, KMEM_TCP_LIMIT, memory.KernelTCP as i128)?;
 
-        if memory.swapiness.unwrap_or(0) <= 100 {
-            write_file(dir, SWAPPINESS, memory.swapiness.unwrap_or(0))?;
+        if memory.Swappiness <= 100 {
+            write_file(dir, SWAPPINESS, memory.Swappiness)?;
         }
 
-        if memory.disable_oom_killer.unwrap_or(false) {
+        if memory.DisableOOMKiller {
             write_file(dir, OOM_CONTROL, 1)?;
         }
 
@@ -805,14 +808,14 @@ impl Subsystem for Pids {
     }
 
     fn set(&self, dir: &str, r: &LinuxResources, _update: bool) -> Result<()> {
-        if r.pids.is_none() {
+        if r.Pids.is_none() {
             return Ok(());
         }
 
-        let pids = r.pids.as_ref().unwrap();
+        let pids = r.Pids.as_ref().unwrap();
 
-        let v = if pids.limit > 0 {
-            pids.limit.to_string()
+        let v = if pids.Limit > 0 {
+            pids.Limit.to_string()
         } else {
             "max".to_string()
         };
@@ -854,14 +857,14 @@ impl Pids {
 #[inline]
 fn weight(d: &LinuxWeightDevice) -> (String, String) {
     (
-        format!("{:?} {:?}", d.blk, d.weight),
-        format!("{:?} {:?}", d.blk, d.leaf_weight),
+        format!("{}:{} {}", d.Major, d.Minor, d.Weight),
+        format!("{}:{} {}", d.Major, d.Minor, d.LeafWeight),
     )
 }
 
 #[inline]
 fn rate(d: &LinuxThrottleDevice) -> String {
-    format!("{:?} {}", d.blk, d.rate)
+    format!("{}:{} {}", d.Major, d.Minor, d.Rate)
 }
 
 fn write_blkio_device<T: ToString>(dir: &str, file: &str, v: T) -> Result<()> {
@@ -892,38 +895,34 @@ impl Subsystem for Blkio {
     }
 
     fn set(&self, dir: &str, r: &LinuxResources, _update: bool) -> Result<()> {
-        if r.block_io.is_none() {
+        if r.BlockIO.is_none() {
             return Ok(());
         }
 
-        let blkio = r.block_io.as_ref().unwrap();
+        let blkio = r.BlockIO.as_ref().unwrap();
 
-        write_nonzero(dir, BLKIO_WEIGHT, blkio.weight.unwrap_or(0) as i128)?;
-        write_nonzero(
-            dir,
-            BLKIO_LEAF_WEIGHT,
-            blkio.leaf_weight.unwrap_or(0) as i128,
-        )?;
+        write_nonzero(dir, BLKIO_WEIGHT, blkio.Weight as i128)?;
+        write_nonzero(dir, BLKIO_LEAF_WEIGHT, blkio.LeafWeight as i128)?;
 
-        for d in blkio.weight_device.iter() {
+        for d in blkio.WeightDevice.iter() {
             let (w, lw) = weight(d);
             write_blkio_device(dir, BLKIO_WEIGHT_DEVICE, w)?;
             write_blkio_device(dir, BLKIO_LEAF_WEIGHT_DEVICE, lw)?;
         }
 
-        for d in blkio.throttle_read_bps_device.iter() {
+        for d in blkio.ThrottleReadBpsDevice.iter() {
             write_blkio_device(dir, BLKIO_READ_BPS_DEVICE, rate(d))?;
         }
 
-        for d in blkio.throttle_write_bps_device.iter() {
+        for d in blkio.ThrottleWriteBpsDevice.iter() {
             write_blkio_device(dir, BLKIO_WRITE_BPS_DEVICE, rate(d))?;
         }
 
-        for d in blkio.throttle_read_iops_device.iter() {
+        for d in blkio.ThrottleReadIOPSDevice.iter() {
             write_blkio_device(dir, BLKIO_READ_IOPS_DEVICE, rate(d))?;
         }
 
-        for d in blkio.throttle_write_iops_device.iter() {
+        for d in blkio.ThrottleWriteIOPSDevice.iter() {
             write_blkio_device(dir, BLKIO_WRITE_IOPS_DEVICE, rate(d))?;
         }
 
@@ -935,11 +934,6 @@ fn get_blkio_stat(dir: &str, file: &str) -> Result<RepeatedField<BlkioStatsEntry
     let p = format!("{}/{}", dir, file);
     let mut m = RepeatedField::new();
 
-    // do as runc
-    if !Path::new(&p).exists() {
-        return Ok(RepeatedField::new());
-    }
-
     for l in fs::read_to_string(p.as_str())?.lines() {
         let parts: Vec<&str> = l.split(' ').collect();
 
@@ -1016,9 +1010,9 @@ impl Subsystem for HugeTLB {
     }
 
     fn set(&self, dir: &str, r: &LinuxResources, _update: bool) -> Result<()> {
-        for l in r.hugepage_limits.iter() {
-            let file = format!("hugetlb.{}.limit_in_bytes", l.page_size);
-            write_file(dir, file.as_str(), l.limit)?;
+        for l in r.HugepageLimits.iter() {
+            let file = format!("hugetlb.{}.limit_in_bytes", l.Pagesize);
+            write_file(dir, file.as_str(), l.Limit)?;
         }
         Ok(())
     }
@@ -1058,13 +1052,13 @@ impl Subsystem for NetCls {
     }
 
     fn set(&self, dir: &str, r: &LinuxResources, _update: bool) -> Result<()> {
-        if r.network.is_none() {
+        if r.Network.is_none() {
             return Ok(());
         }
 
-        let network = r.network.as_ref().unwrap();
+        let network = r.Network.as_ref().unwrap();
 
-        write_nonzero(dir, NET_CLS_CLASSID, network.class_id.unwrap_or(0) as i128)?;
+        write_nonzero(dir, NET_CLS_CLASSID, network.ClassID as i128)?;
 
         Ok(())
     }
@@ -1076,14 +1070,14 @@ impl Subsystem for NetPrio {
     }
 
     fn set(&self, dir: &str, r: &LinuxResources, _update: bool) -> Result<()> {
-        if r.network.is_none() {
+        if r.Network.is_none() {
             return Ok(());
         }
 
-        let network = r.network.as_ref().unwrap();
+        let network = r.Network.as_ref().unwrap();
 
-        for p in network.priorities.iter() {
-            let prio = format!("{} {}", p.name, p.priority);
+        for p in network.Priorities.iter() {
+            let prio = format!("{} {}", p.Name, p.Priority);
 
             try_write_file(dir, NET_PRIO_IFPRIOMAP, prio)?;
         }
@@ -1228,7 +1222,7 @@ fn get_all_procs(dir: &str) -> Result<Vec<i32>> {
     Ok(m)
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Debug, Clone)]
 pub struct Manager {
     pub paths: HashMap<String, String>,
     pub mounts: HashMap<String, String>,
@@ -1242,6 +1236,7 @@ pub const FROZEN: &'static str = "FROZEN";
 impl CgroupManager for Manager {
     fn apply(&self, pid: pid_t) -> Result<()> {
         for (key, value) in &self.paths {
+            info!(sl!(), "apply cgroup {}", key);
             apply(value, pid)?;
         }
 
@@ -1252,6 +1247,7 @@ impl CgroupManager for Manager {
         for (key, value) in &self.paths {
             let _ = fs::create_dir_all(value);
             let sub = get_subsystem(key)?;
+            info!(sl!(), "setting cgroup {}", key);
             sub.set(value, spec, update)?;
         }
 
@@ -1303,16 +1299,9 @@ impl CgroupManager for Manager {
         };
 
         // BlkioStats
-        // note that virtiofs has no blkio stats
         info!(sl!(), "blkio_stats");
         let blkio_stats = if self.paths.get("blkio").is_some() {
-            match Blkio().get_stats(self.paths.get("blkio").unwrap()) {
-                Ok(stat) => SingularPtrField::some(stat),
-                Err(e) => {
-                    warn!(sl!(), "failed to get blkio stats");
-                    SingularPtrField::none()
-                }
-            }
+            SingularPtrField::some(Blkio().get_stats(self.paths.get("blkio").unwrap())?)
         } else {
             SingularPtrField::none()
         };

src/agent/rustjail/src/cgroups/mod.rs

@@ -5,8 +5,8 @@
 
 use crate::errors::*;
 // use crate::configs::{FreezerState, Config};
-use oci::LinuxResources;
 use protocols::agent::CgroupStats;
+use protocols::oci::LinuxResources;
 use std::collections::HashMap;
 
 pub mod fs;

src/agent/rustjail/src/errors.rs

@@ -16,13 +16,11 @@ error_chain! {
         Ffi(std::ffi::NulError);
         Caps(caps::errors::Error);
         Serde(serde_json::Error);
-        FromUTF8(std::string::FromUtf8Error);
+        UTF8(std::string::FromUtf8Error);
         Parse(std::num::ParseIntError);
         Scanfmt(scan_fmt::parse::ScanError);
         Ip(std::net::AddrParseError);
         Regex(regex::Error);
-        EnvVar(std::env::VarError);
-        UTF8(std::str::Utf8Error);
     }
     // define new errors
     errors {

src/agent/rustjail/src/lib.rs

@@ -42,14 +42,14 @@ macro_rules! sl {
     };
 }
 
-pub mod capabilities;
 pub mod cgroups;
 pub mod container;
 pub mod errors;
 pub mod mount;
 pub mod process;
 pub mod specconv;
-pub mod sync;
+// pub mod sync;
+pub mod capabilities;
 pub mod validator;
 
 // pub mod factory;
@@ -66,6 +66,9 @@ pub mod validator;
 // construtc ociSpec from grpcSpec, which is needed for hook
 // execution. since hooks read config.json
 
+use std::collections::HashMap;
+use std::mem::MaybeUninit;
+
 use oci::{
     Box as ociBox, Hooks as ociHooks, Linux as ociLinux, LinuxCapabilities as ociLinuxCapabilities,
     Mount as ociMount, POSIXRlimit as ociPOSIXRlimit, Process as ociProcess, Root as ociRoot,
@@ -75,10 +78,8 @@ use protocols::oci::{
     Hooks as grpcHooks, Linux as grpcLinux, Mount as grpcMount, Process as grpcProcess,
     Root as grpcRoot, Spec as grpcSpec,
 };
-use std::collections::HashMap;
-use std::mem::MaybeUninit;
 
-pub fn process_grpc_to_oci(p: &grpcProcess) -> ociProcess {
+fn process_grpc_to_oci(p: &grpcProcess) -> ociProcess {
     let console_size = if p.ConsoleSize.is_some() {
         let c = p.ConsoleSize.as_ref().unwrap();
         Some(ociBox {
@@ -295,7 +296,7 @@ fn blockio_grpc_to_oci(blk: &grpcLinuxBlockIO) -> ociLinuxBlockIO {
     }
 }
 
-pub fn resources_grpc_to_oci(res: &grpcLinuxResources) -> ociLinuxResources {
+fn resources_grpc_to_oci(res: &grpcLinuxResources) -> ociLinuxResources {
     let devices = {
         let mut d = Vec::new();
         for dev in res.Devices.iter() {

src/agent/rustjail/src/mount.rs

@@ -10,11 +10,10 @@ use nix::mount::{self, MntFlags, MsFlags};
 use nix::sys::stat::{self, Mode, SFlag};
 use nix::unistd::{self, Gid, Uid};
 use nix::NixPath;
-use oci::{LinuxDevice, Mount, Spec};
+use protocols::oci::{LinuxDevice, Mount, Spec};
 use std::collections::{HashMap, HashSet};
 use std::fs::{self, OpenOptions};
 use std::os::unix;
-use std::os::unix::io::RawFd;
 use std::path::{Path, PathBuf};
 
 use path_absolutize::*;
@@ -24,11 +23,11 @@ use std::io::{BufRead, BufReader};
 
 use crate::container::DEFAULT_DEVICES;
 use crate::errors::*;
-use crate::sync::write_count;
 use lazy_static;
 use std::string::ToString;
 
-use crate::log_child;
+use protobuf::{CachedSize, RepeatedField, UnknownFields};
+use slog::Logger;
 
 // Info reveals information about a particular mounted filesystem. This
 // struct is populated from the content in the /proc/<pid>/mountinfo file.
@@ -99,7 +98,7 @@ lazy_static! {
 }
 
 pub fn init_rootfs(
-    cfd_log: RawFd,
+    logger: &Logger,
     spec: &Spec,
     cpath: &HashMap<String, String>,
     mounts: &HashMap<String, String>,
@@ -109,14 +108,14 @@ pub fn init_rootfs(
     lazy_static::initialize(&PROPAGATION);
     lazy_static::initialize(&LINUXDEVICETYPE);
 
-    let linux = spec.linux.as_ref().unwrap();
+    let linux = spec.Linux.as_ref().unwrap();
     let mut flags = MsFlags::MS_REC;
-    match PROPAGATION.get(&linux.rootfs_propagation.as_str()) {
+    match PROPAGATION.get(&linux.RootfsPropagation.as_str()) {
         Some(fl) => flags |= *fl,
         None => flags |= MsFlags::MS_SLAVE,
     }
 
-    let rootfs = spec.root.as_ref().unwrap().path.as_str();
+    let rootfs = spec.Root.as_ref().unwrap().Path.as_str();
     let root = fs::canonicalize(rootfs)?;
     let rootfs = root.to_str().unwrap();
 
@@ -129,19 +128,19 @@ pub fn init_rootfs(
         None::<&str>,
     )?;
 
-    for m in &spec.mounts {
+    for m in &spec.Mounts {
         let (mut flags, data) = parse_mount(&m);
         if !m.destination.starts_with("/") || m.destination.contains("..") {
             return Err(ErrorKind::Nix(nix::Error::Sys(Errno::EINVAL)).into());
         }
-        if m.r#type == "cgroup" {
-            mount_cgroups(cfd_log, &m, rootfs, flags, &data, cpath, mounts)?;
+        if m.field_type == "cgroup" {
+            mount_cgroups(logger, m, rootfs, flags, &data, cpath, mounts)?;
         } else {
             if m.destination == "/dev" {
                 flags &= !MsFlags::MS_RDONLY;
             }
 
-            mount_from(cfd_log, &m, &rootfs, flags, &data, "")?;
+            mount_from(&m, &rootfs, flags, &data, "")?;
         }
     }
 
@@ -149,7 +148,7 @@ pub fn init_rootfs(
     unistd::chdir(rootfs)?;
 
     default_symlinks()?;
-    create_devices(&linux.devices, bind_device)?;
+    create_devices(&linux.Devices, bind_device)?;
     ensure_ptmx()?;
 
     unistd::chdir(&olddir)?;
@@ -158,7 +157,7 @@ pub fn init_rootfs(
 }
 
 fn mount_cgroups(
-    cfd_log: RawFd,
+    logger: &Logger,
     m: &Mount,
     rootfs: &str,
     flags: MsFlags,
@@ -169,14 +168,16 @@ fn mount_cgroups(
     // mount tmpfs
     let ctm = Mount {
         source: "tmpfs".to_string(),
-        r#type: "tmpfs".to_string(),
+        field_type: "tmpfs".to_string(),
         destination: m.destination.clone(),
-        options: Vec::new(),
+        options: RepeatedField::default(),
+        unknown_fields: UnknownFields::default(),
+        cached_size: CachedSize::default(),
     };
 
     let cflags = MsFlags::MS_NOEXEC | MsFlags::MS_NOSUID | MsFlags::MS_NODEV;
-    //  info!(logger, "tmpfs");
-    mount_from(cfd_log, &ctm, rootfs, cflags, "", "")?;
+    info!(logger, "tmpfs");
+    mount_from(&ctm, rootfs, cflags, "", "")?;
     let olddir = unistd::getcwd()?;
 
     unistd::chdir(rootfs)?;
@@ -185,7 +186,7 @@ fn mount_cgroups(
 
     // bind mount cgroups
     for (key, mount) in mounts.iter() {
-        log_child!(cfd_log, "mount cgroup subsystem {}", key);
+        info!(logger, "{}", key);
         let source = if cpath.get(key).is_some() {
             cpath.get(key).unwrap()
         } else {
@@ -212,33 +213,36 @@ fn mount_cgroups(
 
         srcs.insert(source.to_string());
 
-        log_child!(cfd_log, "mount destination: {}", destination.as_str());
+        info!(logger, "{}", destination.as_str());
 
         let bm = Mount {
             source: source.to_string(),
-            r#type: "bind".to_string(),
+            field_type: "bind".to_string(),
             destination: destination.clone(),
-            options: Vec::new(),
+            options: RepeatedField::default(),
+            unknown_fields: UnknownFields::default(),
+            cached_size: CachedSize::default(),
         };
 
-        let mut mount_flags: MsFlags = flags | MsFlags::MS_REC | MsFlags::MS_BIND;
-        if key.contains("systemd") {
-            mount_flags &= !MsFlags::MS_RDONLY;
-        }
-        mount_from(cfd_log, &bm, rootfs, mount_flags, "", "")?;
+        mount_from(
+            &bm,
+            rootfs,
+            flags | MsFlags::MS_REC | MsFlags::MS_BIND,
+            "",
+            "",
+        )?;
 
         if key != base {
             let src = format!("{}/{}", m.destination.as_str(), key);
             match unix::fs::symlink(destination.as_str(), &src[1..]) {
                 Err(e) => {
-                    log_child!(
-                        cfd_log,
+                    info!(
+                        logger,
                         "symlink: {} {} err: {}",
                         key,
                         destination.as_str(),
                         e.to_string()
                     );
-
                     return Err(e.into());
                 }
                 Ok(_) => {}
@@ -422,18 +426,11 @@ fn parse_mount(m: &Mount) -> (MsFlags, String) {
     (flags, data.join(","))
 }
 
-fn mount_from(
-    cfd_log: RawFd,
-    m: &Mount,
-    rootfs: &str,
-    flags: MsFlags,
-    data: &str,
-    _label: &str,
-) -> Result<()> {
+fn mount_from(m: &Mount, rootfs: &str, flags: MsFlags, data: &str, _label: &str) -> Result<()> {
     let d = String::from(data);
     let dest = format!("{}{}", rootfs, &m.destination);
 
-    let src = if m.r#type.as_str() == "bind" {
+    let src = if m.field_type.as_str() == "bind" {
         let src = fs::canonicalize(m.source.as_str())?;
         let dir = if src.is_file() {
             Path::new(&dest).parent().unwrap()
@@ -445,8 +442,8 @@ fn mount_from(
         match fs::create_dir_all(&dir) {
             Ok(_) => {}
             Err(e) => {
-                log_child!(
-                    cfd_log,
+                info!(
+                    sl!(),
                     "creat dir {}: {}",
                     dir.to_str().unwrap(),
                     e.to_string()
@@ -464,6 +461,8 @@ fn mount_from(
         PathBuf::from(&m.source)
     };
 
+    info!(sl!(), "{}, {}", src.to_str().unwrap(), dest.as_str());
+
     // ignore this check since some mount's src didn't been a directory
     // such as tmpfs.
     /*
@@ -478,25 +477,20 @@ fn mount_from(
     match stat::stat(dest.as_str()) {
         Ok(_) => {}
         Err(e) => {
-            log_child!(
-                cfd_log,
-                "{}: {}",
-                dest.as_str(),
-                e.as_errno().unwrap().desc()
-            );
+            info!(sl!(), "{}: {}", dest.as_str(), e.as_errno().unwrap().desc());
         }
     }
 
     match mount::mount(
         Some(src.to_str().unwrap()),
         dest.as_str(),
-        Some(m.r#type.as_str()),
+        Some(m.field_type.as_str()),
         flags,
         Some(d.as_str()),
     ) {
         Ok(_) => {}
         Err(e) => {
-            log_child!(cfd_log, "mount error: {}", e.as_errno().unwrap().desc());
+            info!(sl!(), "mount error: {}", e.as_errno().unwrap().desc());
             return Err(e.into());
         }
     }
@@ -519,8 +513,8 @@ fn mount_from(
             None::<&str>,
         ) {
             Err(e) => {
-                log_child!(
-                    cfd_log,
+                info!(
+                    sl!(),
                     "remout {}: {}",
                     dest.as_str(),
                     e.as_errno().unwrap().desc()
@@ -556,8 +550,8 @@ fn create_devices(devices: &[LinuxDevice], bind: bool) -> Result<()> {
         op(dev)?;
     }
     for dev in devices {
-        if !dev.path.starts_with("/dev") || dev.path.contains("..") {
-            let msg = format!("{} is not a valid device path", dev.path);
+        if !dev.Path.starts_with("/dev") || dev.Path.contains("..") {
+            let msg = format!("{} is not a valid device path", dev.Path);
             bail!(ErrorKind::ErrorCode(msg));
         }
         op(dev)?;
@@ -587,22 +581,22 @@ lazy_static! {
 }
 
 fn mknod_dev(dev: &LinuxDevice) -> Result<()> {
-    let f = match LINUXDEVICETYPE.get(dev.r#type.as_str()) {
+    let f = match LINUXDEVICETYPE.get(dev.Type.as_str()) {
         Some(v) => v,
         None => return Err(ErrorKind::ErrorCode("invalid spec".to_string()).into()),
     };
 
     stat::mknod(
-        &dev.path[1..],
+        &dev.Path[1..],
         *f,
-        Mode::from_bits_truncate(dev.file_mode.unwrap_or(0)),
-        makedev(dev.major as u64, dev.minor as u64),
+        Mode::from_bits_truncate(dev.FileMode),
+        makedev(dev.Major as u64, dev.Minor as u64),
     )?;
 
     unistd::chown(
-        &dev.path[1..],
-        Some(Uid::from_raw(dev.uid.unwrap_or(0) as uid_t)),
-        Some(Gid::from_raw(dev.gid.unwrap_or(0) as uid_t)),
+        &dev.Path[1..],
+        Some(Uid::from_raw(dev.UID as uid_t)),
+        Some(Gid::from_raw(dev.GID as uid_t)),
     )?;
 
     Ok(())
@@ -610,7 +604,7 @@ fn mknod_dev(dev: &LinuxDevice) -> Result<()> {
 
 fn bind_dev(dev: &LinuxDevice) -> Result<()> {
     let fd = fcntl::open(
-        &dev.path[1..],
+        &dev.Path[1..],
         OFlag::O_RDWR | OFlag::O_CREAT,
         Mode::from_bits_truncate(0o644),
     )?;
@@ -618,8 +612,8 @@ fn bind_dev(dev: &LinuxDevice) -> Result<()> {
     unistd::close(fd)?;
 
     mount::mount(
-        Some(&*dev.path),
-        &dev.path[1..],
+        Some(&*dev.Path),
+        &dev.Path[1..],
         None::<&str>,
         MsFlags::MS_BIND,
         None::<&str>,
@@ -627,23 +621,23 @@ fn bind_dev(dev: &LinuxDevice) -> Result<()> {
     Ok(())
 }
 
-pub fn finish_rootfs(cfd_log: RawFd, spec: &Spec) -> Result<()> {
+pub fn finish_rootfs(spec: &Spec) -> Result<()> {
     let olddir = unistd::getcwd()?;
-    log_child!(cfd_log, "old cwd: {}", olddir.to_str().unwrap());
+    info!(sl!(), "{}", olddir.to_str().unwrap());
     unistd::chdir("/")?;
-    if spec.linux.is_some() {
-        let linux = spec.linux.as_ref().unwrap();
+    if spec.Linux.is_some() {
+        let linux = spec.Linux.as_ref().unwrap();
 
-        for path in linux.masked_paths.iter() {
+        for path in linux.MaskedPaths.iter() {
             mask_path(path)?;
         }
 
-        for path in linux.readonly_paths.iter() {
+        for path in linux.ReadonlyPaths.iter() {
             readonly_path(path)?;
         }
     }
 
-    for m in spec.mounts.iter() {
+    for m in spec.Mounts.iter() {
         if m.destination == "/dev" {
             let (flags, _) = parse_mount(m);
             if flags.contains(MsFlags::MS_RDONLY) {
@@ -658,7 +652,7 @@ pub fn finish_rootfs(cfd_log: RawFd, spec: &Spec) -> Result<()> {
         }
     }
 
-    if spec.root.as_ref().unwrap().readonly {
+    if spec.Root.as_ref().unwrap().Readonly {
         let flags = MsFlags::MS_BIND | MsFlags::MS_RDONLY | MsFlags::MS_NODEV | MsFlags::MS_REMOUNT;
 
         mount::mount(Some("/"), "/", None::<&str>, flags, None::<&str>)?;

src/agent/rustjail/src/process.rs

@@ -12,7 +12,7 @@ use std::os::unix::io::RawFd;
 // use crate::cgroups::Manager as CgroupManager;
 // use crate::intelrdt::Manager as RdtManager;
 
-use nix::fcntl::{fcntl, FcntlArg, OFlag};
+use nix::fcntl::OFlag;
 use nix::sys::signal::{self, Signal};
 use nix::sys::socket::{self, AddressFamily, SockFlag, SockType};
 use nix::sys::wait::{self, WaitStatus};
@@ -20,7 +20,7 @@ use nix::unistd::{self, Pid};
 use nix::Result;
 
 use nix::Error;
-use oci::Process as OCIProcess;
+use protocols::oci::Process as OCIProcess;
 use slog::Logger;
 
 #[derive(Debug)]
@@ -34,8 +34,10 @@ pub struct Process {
     pub extra_files: Vec<File>,
     //	pub caps: Capabilities,
     //	pub rlimits: Vec<Rlimit>,
+    pub console_socket: Option<RawFd>,
     pub term_master: Option<RawFd>,
-    pub tty: bool,
+    // parent end of fds
+    pub parent_console_socket: Option<RawFd>,
     pub parent_stdin: Option<RawFd>,
     pub parent_stdout: Option<RawFd>,
     pub parent_stderr: Option<RawFd>,
@@ -70,13 +72,7 @@ impl ProcessOperations for Process {
 }
 
 impl Process {
-    pub fn new(
-        logger: &Logger,
-        ocip: &OCIProcess,
-        id: &str,
-        init: bool,
-        pipe_size: i32,
-    ) -> Result<Self> {
+    pub fn new(logger: &Logger, ocip: &OCIProcess, id: &str, init: bool) -> Result<Self> {
         let logger = logger.new(o!("subsystem" => "process"));
 
         let mut p = Process {
@@ -87,8 +83,9 @@ impl Process {
             exit_pipe_w: None,
             exit_pipe_r: None,
             extra_files: Vec::new(),
-            tty: ocip.terminal,
+            console_socket: None,
             term_master: None,
+            parent_console_socket: None,
             parent_stdin: None,
             parent_stdout: None,
             parent_stderr: None,
@@ -101,61 +98,44 @@ impl Process {
 
         info!(logger, "before create console socket!");
 
-        if !p.tty {
-            info!(logger, "created console socket!");
-
-            let (stdin, pstdin) = unistd::pipe2(OFlag::O_CLOEXEC)?;
-            p.parent_stdin = Some(pstdin);
-            p.stdin = Some(stdin);
-
-            let (pstdout, stdout) = create_extended_pipe(OFlag::O_CLOEXEC, pipe_size)?;
-            p.parent_stdout = Some(pstdout);
-            p.stdout = Some(stdout);
-
-            let (pstderr, stderr) = create_extended_pipe(OFlag::O_CLOEXEC, pipe_size)?;
-            p.parent_stderr = Some(pstderr);
-            p.stderr = Some(stderr);
+        if ocip.Terminal {
+            let (psocket, csocket) = match socket::socketpair(
+                AddressFamily::Unix,
+                SockType::Stream,
+                None,
+                SockFlag::SOCK_CLOEXEC,
+            ) {
+                Ok((u, v)) => (u, v),
+                Err(e) => {
+                    match e {
+                        Error::Sys(errno) => {
+                            info!(logger, "socketpair: {}", errno.desc());
+                        }
+                        _ => {
+                            info!(logger, "socketpair: other error!");
+                        }
+                    }
+                    return Err(e);
+                }
+            };
+            p.parent_console_socket = Some(psocket);
+            p.console_socket = Some(csocket);
         }
+
+        info!(logger, "created console socket!");
+
+        let (stdin, pstdin) = unistd::pipe2(OFlag::O_CLOEXEC)?;
+        p.parent_stdin = Some(pstdin);
+        p.stdin = Some(stdin);
+
+        let (pstdout, stdout) = unistd::pipe2(OFlag::O_CLOEXEC)?;
+        p.parent_stdout = Some(pstdout);
+        p.stdout = Some(stdout);
+
+        let (pstderr, stderr) = unistd::pipe2(OFlag::O_CLOEXEC)?;
+        p.parent_stderr = Some(pstderr);
+        p.stderr = Some(stderr);
+
         Ok(p)
     }
 }
-
-fn create_extended_pipe(flags: OFlag, pipe_size: i32) -> Result<(RawFd, RawFd)> {
-    let (r, w) = unistd::pipe2(flags)?;
-    if pipe_size > 0 {
-        fcntl(w, FcntlArg::F_SETPIPE_SZ(pipe_size))?;
-    }
-    Ok((r, w))
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::process::create_extended_pipe;
-    use nix::fcntl::{fcntl, FcntlArg, OFlag};
-    use std::fs;
-    use std::os::unix::io::RawFd;
-
-    fn get_pipe_max_size() -> i32 {
-        fs::read_to_string("/proc/sys/fs/pipe-max-size")
-            .unwrap()
-            .trim()
-            .parse::<i32>()
-            .unwrap()
-    }
-
-    fn get_pipe_size(fd: RawFd) -> i32 {
-        fcntl(fd, FcntlArg::F_GETPIPE_SZ).unwrap()
-    }
-
-    #[test]
-    fn test_create_extended_pipe() {
-        // Test the default
-        let (r, w) = create_extended_pipe(OFlag::O_CLOEXEC, 0).unwrap();
-
-        // Test setting to the max size
-        let max_size = get_pipe_max_size();
-        let (r, w) = create_extended_pipe(OFlag::O_CLOEXEC, max_size).unwrap();
-        let actual_size = get_pipe_size(w);
-        assert_eq!(max_size, actual_size);
-    }
-}

src/agent/rustjail/src/specconv.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-use oci::Spec;
+use protocols::oci::Spec;
 // use crate::configs::namespaces;
 // use crate::configs::device::Device;
 

src/agent/rustjail/src/sync.rs

@@ -1,177 +0,0 @@
-// Copyright (c) 2019 Ant Financial
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-use crate::errors::*;
-use nix::errno::Errno;
-use nix::unistd;
-use nix::Error;
-use std::mem;
-use std::os::unix::io::RawFd;
-
-pub const SYNC_SUCCESS: i32 = 1;
-pub const SYNC_FAILED: i32 = 2;
-pub const SYNC_DATA: i32 = 3;
-
-const DATA_SIZE: usize = 100;
-const MSG_SIZE: usize = mem::size_of::<i32>();
-
-#[macro_export]
-macro_rules! log_child {
-    ($fd:expr, $($arg:tt)+) => ({
-        let lfd = $fd;
-        let mut log_str = format_args!($($arg)+).to_string();
-        log_str.push('\n');
-        write_count(lfd, log_str.as_bytes(), log_str.len());
-    })
-}
-
-pub fn write_count(fd: RawFd, buf: &[u8], count: usize) -> Result<usize> {
-    let mut len = 0;
-
-    loop {
-        match unistd::write(fd, &buf[len..]) {
-            Ok(l) => {
-                len += l;
-                if len == count {
-                    break;
-                }
-            }
-
-            Err(e) => {
-                if e != Error::from_errno(Errno::EINTR) {
-                    return Err(e.into());
-                }
-            }
-        }
-    }
-
-    Ok(len)
-}
-
-fn read_count(fd: RawFd, count: usize) -> Result<Vec<u8>> {
-    let mut v: Vec<u8> = vec![0; count];
-    let mut len = 0;
-
-    loop {
-        match unistd::read(fd, &mut v[len..]) {
-            Ok(l) => {
-                len += l;
-                if len == count || l == 0 {
-                    break;
-                }
-            }
-
-            Err(e) => {
-                if e != Error::from_errno(Errno::EINTR) {
-                    return Err(e.into());
-                }
-            }
-        }
-    }
-
-    Ok(v[0..len].to_vec())
-}
-
-pub fn read_sync(fd: RawFd) -> Result<Vec<u8>> {
-    let buf = read_count(fd, MSG_SIZE)?;
-    if buf.len() != MSG_SIZE {
-        return Err(ErrorKind::ErrorCode(format!(
-            "process: {} failed to receive sync message from peer: got msg length: {}, expected: {}",
-            std::process::id(),
-            buf.len(),
-            MSG_SIZE
-        ))
-        .into());
-    }
-    let buf_array: [u8; MSG_SIZE] = [buf[0], buf[1], buf[2], buf[3]];
-    let msg: i32 = i32::from_be_bytes(buf_array);
-    match msg {
-        SYNC_SUCCESS => return Ok(Vec::new()),
-        SYNC_DATA => {
-            let buf = read_count(fd, MSG_SIZE)?;
-            let buf_array: [u8; MSG_SIZE] = [buf[0], buf[1], buf[2], buf[3]];
-            let msg_length: i32 = i32::from_be_bytes(buf_array);
-            let data_buf = read_count(fd, msg_length as usize)?;
-
-            return Ok(data_buf);
-        }
-        SYNC_FAILED => {
-            let mut error_buf = vec![];
-            loop {
-                let buf = read_count(fd, DATA_SIZE)?;
-
-                error_buf.extend(&buf);
-                if DATA_SIZE == buf.len() {
-                    continue;
-                } else {
-                    break;
-                }
-            }
-
-            let error_str = match std::str::from_utf8(&error_buf) {
-                Ok(v) => v,
-                Err(e) => {
-                    return Err(ErrorKind::ErrorCode(format!(
-                        "receive error message from child process failed: {:?}",
-                        e
-                    ))
-                    .into())
-                }
-            };
-
-            return Err(ErrorKind::ErrorCode(String::from(error_str)).into());
-        }
-        _ => return Err(ErrorKind::ErrorCode("error in receive sync message".to_string()).into()),
-    }
-}
-
-pub fn write_sync(fd: RawFd, msg_type: i32, data_str: &str) -> Result<()> {
-    let buf = msg_type.to_be_bytes();
-
-    let count = write_count(fd, &buf, MSG_SIZE)?;
-    if count != MSG_SIZE {
-        return Err(ErrorKind::ErrorCode("error in send sync message".to_string()).into());
-    }
-
-    match msg_type {
-        SYNC_FAILED => match write_count(fd, data_str.as_bytes(), data_str.len()) {
-            Ok(_count) => unistd::close(fd)?,
-            Err(e) => {
-                unistd::close(fd)?;
-                return Err(
-                    ErrorKind::ErrorCode("error in send message to process".to_string()).into(),
-                );
-            }
-        },
-        SYNC_DATA => {
-            let length: i32 = data_str.len() as i32;
-            match write_count(fd, &length.to_be_bytes(), MSG_SIZE) {
-                Ok(_count) => (),
-                Err(e) => {
-                    unistd::close(fd)?;
-                    return Err(ErrorKind::ErrorCode(
-                        "error in send message to process".to_string(),
-                    )
-                    .into());
-                }
-            }
-
-            match write_count(fd, data_str.as_bytes(), data_str.len()) {
-                Ok(_count) => (),
-                Err(e) => {
-                    unistd::close(fd)?;
-                    return Err(ErrorKind::ErrorCode(
-                        "error in send message to process".to_string(),
-                    )
-                    .into());
-                }
-            }
-        }
-
-        _ => (),
-    };
-
-    Ok(())
-}

src/agent/rustjail/src/validator.rs

@@ -8,14 +8,14 @@ use crate::errors::*;
 use lazy_static;
 use nix::errno::Errno;
 use nix::Error;
-use oci::{LinuxIDMapping, LinuxNamespace, Spec};
 use protobuf::RepeatedField;
+use protocols::oci::{LinuxIDMapping, LinuxNamespace, Spec};
 use std::collections::HashMap;
 use std::path::{Component, PathBuf};
 
-fn contain_namespace(nses: &Vec<LinuxNamespace>, key: &str) -> bool {
+fn contain_namespace(nses: &RepeatedField<LinuxNamespace>, key: &str) -> bool {
     for ns in nses {
-        if ns.r#type.as_str() == key {
+        if ns.Type.as_str() == key {
             return true;
         }
     }
@@ -23,10 +23,10 @@ fn contain_namespace(nses: &Vec<LinuxNamespace>, key: &str) -> bool {
     false
 }
 
-fn get_namespace_path(nses: &Vec<LinuxNamespace>, key: &str) -> Result<String> {
+fn get_namespace_path(nses: &RepeatedField<LinuxNamespace>, key: &str) -> Result<String> {
     for ns in nses {
-        if ns.r#type.as_str() == key {
-            return Ok(ns.path.clone());
+        if ns.Type.as_str() == key {
+            return Ok(ns.Path.clone());
         }
     }
 
@@ -76,15 +76,15 @@ fn network(_oci: &Spec) -> Result<()> {
 }
 
 fn hostname(oci: &Spec) -> Result<()> {
-    if oci.hostname.is_empty() || oci.hostname == "".to_string() {
+    if oci.Hostname.is_empty() || oci.Hostname == "".to_string() {
         return Ok(());
     }
 
-    if oci.linux.is_none() {
+    if oci.Linux.is_none() {
         return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
     }
-    let linux = oci.linux.as_ref().unwrap();
-    if !contain_namespace(&linux.namespaces, "uts") {
+    let linux = oci.Linux.as_ref().unwrap();
+    if !contain_namespace(&linux.Namespaces, "uts") {
         return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
     }
 
@@ -92,12 +92,12 @@ fn hostname(oci: &Spec) -> Result<()> {
 }
 
 fn security(oci: &Spec) -> Result<()> {
-    let linux = oci.linux.as_ref().unwrap();
-    if linux.masked_paths.len() == 0 && linux.readonly_paths.len() == 0 {
+    let linux = oci.Linux.as_ref().unwrap();
+    if linux.MaskedPaths.len() == 0 && linux.ReadonlyPaths.len() == 0 {
         return Ok(());
     }
 
-    if !contain_namespace(&linux.namespaces, "mount") {
+    if !contain_namespace(&linux.Namespaces, "mount") {
         return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
     }
 
@@ -106,9 +106,9 @@ fn security(oci: &Spec) -> Result<()> {
     Ok(())
 }
 
-fn idmapping(maps: &Vec<LinuxIDMapping>) -> Result<()> {
+fn idmapping(maps: &RepeatedField<LinuxIDMapping>) -> Result<()> {
     for map in maps {
-        if map.size > 0 {
+        if map.Size > 0 {
             return Ok(());
         }
     }
@@ -117,19 +117,19 @@ fn idmapping(maps: &Vec<LinuxIDMapping>) -> Result<()> {
 }
 
 fn usernamespace(oci: &Spec) -> Result<()> {
-    let linux = oci.linux.as_ref().unwrap();
-    if contain_namespace(&linux.namespaces, "user") {
+    let linux = oci.Linux.as_ref().unwrap();
+    if contain_namespace(&linux.Namespaces, "user") {
         let user_ns = PathBuf::from("/proc/self/ns/user");
         if !user_ns.exists() {
             return Err(ErrorKind::ErrorCode("user namespace not supported!".to_string()).into());
         }
         // check if idmappings is correct, at least I saw idmaps
         // with zero size was passed to agent
-        idmapping(&linux.uid_mappings)?;
-        idmapping(&linux.gid_mappings)?;
+        idmapping(&linux.UIDMappings)?;
+        idmapping(&linux.GIDMappings)?;
     } else {
         // no user namespace but idmap
-        if linux.uid_mappings.len() != 0 || linux.gid_mappings.len() != 0 {
+        if linux.UIDMappings.len() != 0 || linux.GIDMappings.len() != 0 {
             return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
         }
     }
@@ -138,8 +138,8 @@ fn usernamespace(oci: &Spec) -> Result<()> {
 }
 
 fn cgroupnamespace(oci: &Spec) -> Result<()> {
-    let linux = oci.linux.as_ref().unwrap();
-    if contain_namespace(&linux.namespaces, "cgroup") {
+    let linux = oci.Linux.as_ref().unwrap();
+    if contain_namespace(&linux.Namespaces, "cgroup") {
         let path = PathBuf::from("/proc/self/ns/cgroup");
         if !path.exists() {
             return Err(ErrorKind::ErrorCode("cgroup unsupported!".to_string()).into());
@@ -183,10 +183,10 @@ fn check_host_ns(path: &str) -> Result<()> {
 }
 
 fn sysctl(oci: &Spec) -> Result<()> {
-    let linux = oci.linux.as_ref().unwrap();
-    for (key, _) in linux.sysctl.iter() {
+    let linux = oci.Linux.as_ref().unwrap();
+    for (key, _) in linux.Sysctl.iter() {
         if SYSCTLS.contains_key(key.as_str()) || key.starts_with("fs.mqueue.") {
-            if contain_namespace(&linux.namespaces, "ipc") {
+            if contain_namespace(&linux.Namespaces, "ipc") {
                 continue;
             } else {
                 return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
@@ -194,11 +194,11 @@ fn sysctl(oci: &Spec) -> Result<()> {
         }
 
         if key.starts_with("net.") {
-            if !contain_namespace(&linux.namespaces, "network") {
+            if !contain_namespace(&linux.Namespaces, "network") {
                 return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
             }
 
-            let net = get_namespace_path(&linux.namespaces, "network")?;
+            let net = get_namespace_path(&linux.Namespaces, "network")?;
             if net.is_empty() || net == "".to_string() {
                 continue;
             }
@@ -206,7 +206,7 @@ fn sysctl(oci: &Spec) -> Result<()> {
             check_host_ns(net.as_str())?;
         }
 
-        if contain_namespace(&linux.namespaces, "uts") {
+        if contain_namespace(&linux.Namespaces, "uts") {
             if key == "kernel.domainname" {
                 continue;
             }
@@ -222,21 +222,21 @@ fn sysctl(oci: &Spec) -> Result<()> {
 }
 
 fn rootless_euid_mapping(oci: &Spec) -> Result<()> {
-    let linux = oci.linux.as_ref().unwrap();
-    if !contain_namespace(&linux.namespaces, "user") {
+    let linux = oci.Linux.as_ref().unwrap();
+    if !contain_namespace(&linux.Namespaces, "user") {
         return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
     }
 
-    if linux.gid_mappings.len() == 0 || linux.gid_mappings.len() == 0 {
+    if linux.UIDMappings.len() == 0 || linux.GIDMappings.len() == 0 {
         return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
     }
 
     Ok(())
 }
 
-fn has_idmapping(maps: &Vec<LinuxIDMapping>, id: u32) -> bool {
+fn has_idmapping(maps: &RepeatedField<LinuxIDMapping>, id: u32) -> bool {
     for map in maps {
-        if id >= map.container_id && id < map.container_id + map.size {
+        if id >= map.ContainerID && id < map.ContainerID + map.Size {
             return true;
         }
     }
@@ -244,9 +244,9 @@ fn has_idmapping(maps: &Vec<LinuxIDMapping>, id: u32) -> bool {
 }
 
 fn rootless_euid_mount(oci: &Spec) -> Result<()> {
-    let linux = oci.linux.as_ref().unwrap();
+    let linux = oci.Linux.as_ref().unwrap();
 
-    for mnt in oci.mounts.iter() {
+    for mnt in oci.Mounts.iter() {
         for opt in mnt.options.iter() {
             if opt.starts_with("uid=") || opt.starts_with("gid=") {
                 let fields: Vec<&str> = opt.split('=').collect();
@@ -258,13 +258,13 @@ fn rootless_euid_mount(oci: &Spec) -> Result<()> {
                 let id = fields[1].trim().parse::<u32>()?;
 
                 if opt.starts_with("uid=") {
-                    if !has_idmapping(&linux.uid_mappings, id) {
+                    if !has_idmapping(&linux.UIDMappings, id) {
                         return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
                     }
                 }
 
                 if opt.starts_with("gid=") {
-                    if !has_idmapping(&linux.gid_mappings, id) {
+                    if !has_idmapping(&linux.GIDMappings, id) {
                         return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
                     }
                 }
@@ -284,14 +284,14 @@ pub fn validate(conf: &Config) -> Result<()> {
     lazy_static::initialize(&SYSCTLS);
     let oci = conf.spec.as_ref().unwrap();
 
-    if oci.linux.is_none() {
+    if oci.Linux.is_none() {
         return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
     }
 
-    if oci.root.is_none() {
+    if oci.Root.is_none() {
         return Err(ErrorKind::Nix(Error::from_errno(Errno::EINVAL)).into());
     }
-    let root = oci.root.as_ref().unwrap().path.as_str();
+    let root = oci.Root.get_ref().Path.as_str();
 
     rootfs(root)?;
     network(oci)?;

src/agent/src/config.rs

@@ -10,13 +10,9 @@ const DEBUG_CONSOLE_FLAG: &str = "agent.debug_console";
 const DEV_MODE_FLAG: &str = "agent.devmode";
 const LOG_LEVEL_OPTION: &str = "agent.log";
 const HOTPLUG_TIMOUT_OPTION: &str = "agent.hotplug_timeout";
-const DEBUG_CONSOLE_VPORT_OPTION: &str = "agent.debug_console_vport";
-const LOG_VPORT_OPTION: &str = "agent.log_vport";
-const CONTAINER_PIPE_SIZE_OPTION: &str = "agent.container_pipe_size";
 
 const DEFAULT_LOG_LEVEL: slog::Level = slog::Level::Info;
 const DEFAULT_HOTPLUG_TIMEOUT: time::Duration = time::Duration::from_secs(3);
-const DEFAULT_CONTAINER_PIPE_SIZE: i32 = 0;
 
 // FIXME: unused
 const TRACE_MODE_FLAG: &str = "agent.trace";
@@ -28,9 +24,6 @@ pub struct agentConfig {
     pub dev_mode: bool,
     pub log_level: slog::Level,
     pub hotplug_timeout: time::Duration,
-    pub debug_console_vport: i32,
-    pub log_vport: i32,
-    pub container_pipe_size: i32,
 }
 
 impl agentConfig {
@@ -40,9 +33,6 @@ impl agentConfig {
             dev_mode: false,
             log_level: DEFAULT_LOG_LEVEL,
             hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-            debug_console_vport: 0,
-            log_vport: 0,
-            container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
         }
     }
 
@@ -70,40 +60,12 @@ impl agentConfig {
                     self.hotplug_timeout = hotplugTimeout;
                 }
             }
-
-            if param.starts_with(format!("{}=", DEBUG_CONSOLE_VPORT_OPTION).as_str()) {
-                let port = get_vsock_port(param)?;
-                if port > 0 {
-                    self.debug_console_vport = port;
-                }
-            }
-
-            if param.starts_with(format!("{}=", LOG_VPORT_OPTION).as_str()) {
-                let port = get_vsock_port(param)?;
-                if port > 0 {
-                    self.log_vport = port;
-                }
-            }
-
-            if param.starts_with(format!("{}=", CONTAINER_PIPE_SIZE_OPTION).as_str()) {
-                let container_pipe_size = get_container_pipe_size(param)?;
-                self.container_pipe_size = container_pipe_size
-            }
         }
 
         Ok(())
     }
 }
 
-fn get_vsock_port(p: &str) -> Result<i32> {
-    let fields: Vec<&str> = p.split("=").collect();
-    if fields.len() != 2 {
-        return Err(ErrorKind::ErrorCode("invalid port parameter".to_string()).into());
-    }
-
-    Ok(fields[1].parse::<i32>()?)
-}
-
 // Map logrus (https://godoc.org/github.com/sirupsen/logrus)
 // log level to the equivalent slog log levels.
 //
@@ -165,40 +127,6 @@ fn get_hotplug_timeout(param: &str) -> Result<time::Duration> {
     Ok(time::Duration::from_secs(value.unwrap()))
 }
 
-fn get_container_pipe_size(param: &str) -> Result<i32> {
-    let fields: Vec<&str> = param.split("=").collect();
-
-    if fields.len() != 2 {
-        return Err(
-            ErrorKind::ErrorCode(String::from("invalid container pipe size parameter")).into(),
-        );
-    }
-
-    let key = fields[0];
-    if key != CONTAINER_PIPE_SIZE_OPTION {
-        return Err(
-            ErrorKind::ErrorCode(String::from("invalid container pipe size key name")).into(),
-        );
-    }
-
-    let res = fields[1].parse::<i32>();
-    if res.is_err() {
-        return Err(
-            ErrorKind::ErrorCode(String::from("unable to parse container pipe size")).into(),
-        );
-    }
-
-    let value = res.unwrap();
-    if value < 0 {
-        return Err(ErrorKind::ErrorCode(String::from(
-            "container pipe size should not be negative",
-        ))
-        .into());
-    }
-
-    Ok(value)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -215,11 +143,6 @@ mod tests {
     const ERR_INVALID_HOTPLUG_TIMEOUT_PARAM: &str = "unable to parse hotplug timeout";
     const ERR_INVALID_HOTPLUG_TIMEOUT_KEY: &str = "invalid hotplug timeout key name";
 
-    const ERR_INVALID_CONTAINER_PIPE_SIZE: &str = "invalid container pipe size parameter";
-    const ERR_INVALID_CONTAINER_PIPE_SIZE_PARAM: &str = "unable to parse container pipe size";
-    const ERR_INVALID_CONTAINER_PIPE_SIZE_KEY: &str = "invalid container pipe size key name";
-    const ERR_INVALID_CONTAINER_PIPE_NEGATIVE: &str = "container pipe size should not be negative";
-
     // helper function to make errors less crazy-long
     fn make_err(desc: &str) -> Error {
         ErrorKind::ErrorCode(desc.to_string()).into()
@@ -266,7 +189,6 @@ mod tests {
             dev_mode: bool,
             log_level: slog::Level,
             hotplug_timeout: time::Duration,
-            container_pipe_size: i32,
         }
 
         let tests = &[
@@ -276,7 +198,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.debug_console agent.devmodex",
@@ -284,7 +205,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.logx=debug",
@@ -292,7 +212,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.log=debug",
@@ -300,7 +219,6 @@ mod tests {
                 dev_mode: false,
                 log_level: slog::Level::Debug,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "",
@@ -308,7 +226,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo",
@@ -316,7 +233,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo bar",
@@ -324,7 +240,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo bar",
@@ -332,7 +247,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo agent bar",
@@ -340,7 +254,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo debug_console agent bar devmode",
@@ -348,7 +261,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.debug_console",
@@ -356,7 +268,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "   agent.debug_console ",
@@ -364,7 +275,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.debug_console foo",
@@ -372,7 +282,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: " agent.debug_console foo",
@@ -380,7 +289,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo agent.debug_console bar",
@@ -388,7 +296,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo agent.debug_console",
@@ -396,7 +303,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo agent.debug_console ",
@@ -404,7 +310,6 @@ mod tests {
                 dev_mode: false,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.devmode",
@@ -412,7 +317,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "   agent.devmode ",
@@ -420,7 +324,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.devmode foo",
@@ -428,7 +331,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: " agent.devmode foo",
@@ -436,7 +338,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo agent.devmode bar",
@@ -444,7 +345,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo agent.devmode",
@@ -452,7 +352,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "foo agent.devmode ",
@@ -460,7 +359,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.devmode agent.debug_console",
@@ -468,7 +366,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.devmode agent.debug_console agent.hotplug_timeout=100",
@@ -476,7 +373,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: time::Duration::from_secs(100),
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
             TestData {
                 contents: "agent.devmode agent.debug_console agent.hotplug_timeout=0",
@@ -484,39 +380,6 @@ mod tests {
                 dev_mode: true,
                 log_level: DEFAULT_LOG_LEVEL,
                 hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
-            },
-            TestData {
-                contents: "agent.devmode agent.debug_console agent.container_pipe_size=2097152",
-                debug_console: true,
-                dev_mode: true,
-                log_level: DEFAULT_LOG_LEVEL,
-                hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: 2097152,
-            },
-            TestData {
-                contents: "agent.devmode agent.debug_console agent.container_pipe_size=100",
-                debug_console: true,
-                dev_mode: true,
-                log_level: DEFAULT_LOG_LEVEL,
-                hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: 100,
-            },
-            TestData {
-                contents: "agent.devmode agent.debug_console agent.container_pipe_size=0",
-                debug_console: true,
-                dev_mode: true,
-                log_level: DEFAULT_LOG_LEVEL,
-                hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
-            },
-            TestData {
-                contents: "agent.devmode agent.debug_console agent.container_pip_siz=100",
-                debug_console: true,
-                dev_mode: true,
-                log_level: DEFAULT_LOG_LEVEL,
-                hotplug_timeout: DEFAULT_HOTPLUG_TIMEOUT,
-                container_pipe_size: DEFAULT_CONTAINER_PIPE_SIZE,
             },
         ];
 
@@ -546,15 +409,9 @@ mod tests {
                 .expect(&format!("{}: failed to write file contents", msg));
 
             let mut config = agentConfig::new();
-            assert_eq!(config.debug_console, false, "{}", msg);
-            assert_eq!(config.dev_mode, false, "{}", msg);
-            assert_eq!(
-                config.hotplug_timeout,
-                time::Duration::from_secs(3),
-                "{}",
-                msg
-            );
-            assert_eq!(config.container_pipe_size, 0, "{}", msg);
+            assert!(config.debug_console == false, msg);
+            assert!(config.dev_mode == false, msg);
+            assert!(config.hotplug_timeout == time::Duration::from_secs(3), msg);
 
             let result = config.parse_cmdline(filename);
             assert!(result.is_ok(), "{}", msg);
@@ -563,7 +420,6 @@ mod tests {
             assert_eq!(d.dev_mode, config.dev_mode, "{}", msg);
             assert_eq!(d.log_level, config.log_level, "{}", msg);
             assert_eq!(d.hotplug_timeout, config.hotplug_timeout, "{}", msg);
-            assert_eq!(d.container_pipe_size, config.container_pipe_size, "{}", msg);
         }
     }
 
@@ -804,78 +660,4 @@ mod tests {
             assert_result!(d.result, result, format!("{}", msg));
         }
     }
-
-    #[test]
-    fn test_get_container_pipe_size() {
-        #[derive(Debug)]
-        struct TestData<'a> {
-            param: &'a str,
-            result: Result<i32>,
-        }
-
-        let tests = &[
-            TestData {
-                param: "",
-                result: Err(make_err(ERR_INVALID_CONTAINER_PIPE_SIZE)),
-            },
-            TestData {
-                param: "agent.container_pipe_size",
-                result: Err(make_err(ERR_INVALID_CONTAINER_PIPE_SIZE)),
-            },
-            TestData {
-                param: "foo=bar",
-                result: Err(make_err(ERR_INVALID_CONTAINER_PIPE_SIZE_KEY)),
-            },
-            TestData {
-                param: "agent.container_pip_siz=1",
-                result: Err(make_err(ERR_INVALID_CONTAINER_PIPE_SIZE_KEY)),
-            },
-            TestData {
-                param: "agent.container_pipe_size=1",
-                result: Ok(1),
-            },
-            TestData {
-                param: "agent.container_pipe_size=3",
-                result: Ok(3),
-            },
-            TestData {
-                param: "agent.container_pipe_size=2097152",
-                result: Ok(2097152),
-            },
-            TestData {
-                param: "agent.container_pipe_size=0",
-                result: Ok(0),
-            },
-            TestData {
-                param: "agent.container_pipe_size=-1",
-                result: Err(make_err(ERR_INVALID_CONTAINER_PIPE_NEGATIVE)),
-            },
-            TestData {
-                param: "agent.container_pipe_size=foobar",
-                result: Err(make_err(ERR_INVALID_CONTAINER_PIPE_SIZE_PARAM)),
-            },
-            TestData {
-                param: "agent.container_pipe_size=j",
-                result: Err(make_err(ERR_INVALID_CONTAINER_PIPE_SIZE_PARAM)),
-            },
-            TestData {
-                param: "agent.container_pipe_size=4jbsdja",
-                result: Err(make_err(ERR_INVALID_CONTAINER_PIPE_SIZE_PARAM)),
-            },
-            TestData {
-                param: "agent.container_pipe_size=4294967296",
-                result: Err(make_err(ERR_INVALID_CONTAINER_PIPE_SIZE_PARAM)),
-            },
-        ];
-
-        for (i, d) in tests.iter().enumerate() {
-            let msg = format!("test[{}]: {:?}", i, d);
-
-            let result = get_container_pipe_size(d.param);
-
-            let msg = format!("{}: result: {:?}", msg, result);
-
-            assert_result!(d.result, result, format!("{}", msg));
-        }
-    }
 }

src/agent/src/device.rs

@@ -14,8 +14,8 @@ use crate::linux_abi::*;
 use crate::mount::{DRIVERBLKTYPE, DRIVERMMIOBLKTYPE, DRIVERNVDIMMTYPE, DRIVERSCSITYPE};
 use crate::sandbox::Sandbox;
 use crate::{AGENT_CONFIG, GLOBAL_DEVICE_WATCHER};
-use oci::Spec;
 use protocols::agent::Device;
+use protocols::oci::Spec;
 use rustjail::errors::*;
 
 // Convenience macro to obtain the scope logger
@@ -207,7 +207,7 @@ fn update_spec_device_list(device: &Device, spec: &mut Spec) -> Result<()> {
         .into());
     }
 
-    let linux = match spec.linux.as_mut() {
+    let linux = match spec.Linux.as_mut() {
         None => {
             return Err(
                 ErrorKind::ErrorCode("Spec didn't container linux field".to_string()).into(),
@@ -232,14 +232,14 @@ fn update_spec_device_list(device: &Device, spec: &mut Spec) -> Result<()> {
         "got the device: dev_path: {}, major: {}, minor: {}\n", &device.vm_path, major_id, minor_id
     );
 
-    let devices = linux.devices.as_mut_slice();
+    let devices = linux.Devices.as_mut_slice();
     for dev in devices.iter_mut() {
-        if dev.path == device.container_path {
-            let host_major = dev.major;
-            let host_minor = dev.minor;
+        if dev.Path == device.container_path {
+            let host_major = dev.Major;
+            let host_minor = dev.Minor;
 
-            dev.major = major_id as i64;
-            dev.minor = minor_id as i64;
+            dev.Major = major_id as i64;
+            dev.Minor = minor_id as i64;
 
             info!(
                 sl!(),
@@ -252,12 +252,12 @@ fn update_spec_device_list(device: &Device, spec: &mut Spec) -> Result<()> {
 
             // Resources must be updated since they are used to identify the
             // device in the devices cgroup.
-            if let Some(res) = linux.resources.as_mut() {
-                let ds = res.devices.as_mut_slice();
+            if let Some(res) = linux.Resources.as_mut() {
+                let ds = res.Devices.as_mut_slice();
                 for d in ds.iter_mut() {
-                    if d.major == Some(host_major) && d.minor == Some(host_minor) {
-                        d.major = Some(major_id as i64);
-                        d.minor = Some(minor_id as i64);
+                    if d.Major == host_major && d.Minor == host_minor {
+                        d.Major = major_id as i64;
+                        d.Minor = minor_id as i64;
 
                         info!(
                             sl!(),

src/agent/src/grpc.rs

@@ -8,7 +8,6 @@ use grpcio::{EnvBuilder, Server, ServerBuilder};
 use grpcio::{RpcStatus, RpcStatusCode};
 use std::sync::{Arc, Mutex};
 
-use oci::{LinuxNamespace, Spec};
 use protobuf::{RepeatedField, SingularPtrField};
 use protocols::agent::CopyFileRequest;
 use protocols::agent::{
@@ -17,6 +16,7 @@ use protocols::agent::{
 };
 use protocols::empty::Empty;
 use protocols::health::{HealthCheckResponse, HealthCheckResponse_ServingStatus};
+use protocols::oci::{LinuxNamespace, Spec};
 use rustjail;
 use rustjail::container::{BaseContainer, LinuxContainer};
 use rustjail::errors::*;
@@ -36,12 +36,10 @@ use crate::namespace::{NSTYPEIPC, NSTYPEPID, NSTYPEUTS};
 use crate::random;
 use crate::sandbox::Sandbox;
 use crate::version::{AGENT_VERSION, API_VERSION};
-use crate::AGENT_CONFIG;
 use netlink::{RtnlHandle, NETLINK_ROUTE};
 
 use libc::{self, c_ushort, pid_t, winsize, TIOCSWINSZ};
 use serde_json;
-use std::convert::TryFrom;
 use std::fs;
 use std::os::unix::io::RawFd;
 use std::os::unix::prelude::PermissionsExt;
@@ -81,15 +79,7 @@ impl agentService {
         let sandbox;
         let mut s;
 
-        let mut oci = match oci_spec.as_mut() {
-            Some(spec) => rustjail::grpc_to_oci(spec),
-            None => {
-                error!(sl!(), "no oci spec in the create container request!");
-                return Err(
-                    ErrorKind::Nix(nix::Error::from_errno(nix::errno::Errno::EINVAL)).into(),
-                );
-            }
-        };
+        let oci = oci_spec.as_mut().unwrap();
 
         info!(sl!(), "receive createcontainer {}", &cid);
 
@@ -103,7 +93,7 @@ impl agentService {
         // updates the devices listed in the OCI spec, so that they actually
         // match real devices inside the VM. This step is necessary since we
         // cannot predict everything from the caller.
-        add_devices(&req.devices.to_vec(), &mut oci, &self.sandbox)?;
+        add_devices(&req.devices.to_vec(), oci, &self.sandbox)?;
 
         // Both rootfs and volumes (invoked with --volume for instance) will
         // be processed the same way. The idea is to always mount any provided
@@ -119,13 +109,11 @@ impl agentService {
             s.container_mounts.insert(cid.clone(), m);
         }
 
-        update_container_namespaces(&s, &mut oci)?;
+        update_container_namespaces(&s, oci)?;
 
         // write spec to bundle path, hooks might
         // read ocispec
-        let olddir = setup_bundle(&oci)?;
-        // restore the cwd for kata-agent process.
-        defer!(unistd::chdir(&olddir).unwrap());
+        setup_bundle(oci)?;
 
         let opts = CreateOpts {
             cgroup_name: "".to_string(),
@@ -140,15 +128,8 @@ impl agentService {
         let mut ctr: LinuxContainer =
             LinuxContainer::new(cid.as_str(), CONTAINER_BASE, opts, &sl!())?;
 
-        let pipe_size = AGENT_CONFIG.read().unwrap().container_pipe_size;
-        let p = if oci.process.is_some() {
-            let tp = Process::new(
-                &sl!(),
-                &oci.process.as_ref().unwrap(),
-                eid.as_str(),
-                true,
-                pipe_size,
-            )?;
+        let p = if oci.Process.is_some() {
+            let tp = Process::new(&sl!(), oci.get_Process(), eid.as_str(), true)?;
             tp
         } else {
             info!(sl!(), "no process configurations!");
@@ -188,12 +169,7 @@ impl agentService {
         if req.timeout == 0 {
             let s = Arc::clone(&self.sandbox);
             let mut sandbox = s.lock().unwrap();
-            let ctr: &mut LinuxContainer = match sandbox.get_container(cid.as_str()) {
-                Some(cr) => cr,
-                None => {
-                    return Err(ErrorKind::Nix(nix::Error::from_errno(Errno::EINVAL)).into());
-                }
-            };
+            let ctr = sandbox.get_container(cid.as_str()).unwrap();
 
             ctr.destroy()?;
 
@@ -228,12 +204,7 @@ impl agentService {
 
         let handle = thread::spawn(move || {
             let mut sandbox = s.lock().unwrap();
-            let ctr: &mut LinuxContainer = match sandbox.get_container(cid2.as_str()) {
-                Some(cr) => cr,
-                None => {
-                    return;
-                }
-            };
+            let ctr = sandbox.get_container(cid2.as_str()).unwrap();
 
             ctr.destroy().unwrap();
             tx.send(1).unwrap();
@@ -286,15 +257,13 @@ impl agentService {
         let mut sandbox = s.lock().unwrap();
 
         // ignore string_user, not sure what it is
-        let process = if req.process.is_some() {
+        let ocip = if req.process.is_some() {
             req.process.as_ref().unwrap()
         } else {
             return Err(ErrorKind::Nix(nix::Error::from_errno(nix::errno::Errno::EINVAL)).into());
         };
 
-        let pipe_size = AGENT_CONFIG.read().unwrap().container_pipe_size;
-        let ocip = rustjail::process_grpc_to_oci(process);
-        let p = Process::new(&sl!(), &ocip, exec_id.as_str(), false, pipe_size)?;
+        let p = Process::new(&sl!(), ocip, exec_id.as_str(), false)?;
 
         let ctr = match sandbox.get_container(cid.as_str()) {
             Some(v) => v,
@@ -315,7 +284,6 @@ impl agentService {
         let eid = req.exec_id.clone();
         let s = Arc::clone(&self.sandbox);
         let mut sandbox = s.lock().unwrap();
-        let mut init = false;
 
         info!(
             sl!(),
@@ -323,14 +291,9 @@ impl agentService {
             "container-id" => cid.clone(),
             "exec-id" => eid.clone()
         );
+        let p = find_process(&mut sandbox, cid.as_str(), eid.as_str(), true)?;
 
-        if eid == "" {
-            init = true;
-        }
-
-        let p = find_process(&mut sandbox, cid.as_str(), eid.as_str(), init)?;
-
-        let mut signal = Signal::try_from(req.signal as i32).unwrap();
+        let mut signal = Signal::from_c_int(req.signal as i32).unwrap();
 
         // For container initProcess, if it hasn't installed handler for "SIGTERM" signal,
         // it will ignore the "SIGTERM" signal sent to it, thus send it "SIGKILL" signal
@@ -381,13 +344,7 @@ impl agentService {
         }
 
         let mut sandbox = s.lock().unwrap();
-        let ctr: &mut LinuxContainer = match sandbox.get_container(cid.as_str()) {
-            Some(cr) => cr,
-            None => {
-                return Err(ErrorKind::Nix(nix::Error::from_errno(Errno::EINVAL)).into());
-            }
-        };
-
+        let ctr = sandbox.get_container(cid.as_str()).unwrap();
         // need to close all fds
         let mut p = ctr.processes.get_mut(&pid).unwrap();
 
@@ -600,11 +557,11 @@ impl protocols::agent_grpc::AgentService for agentService {
         req: protocols::agent::ExecProcessRequest,
         sink: ::grpcio::UnarySink<protocols::empty::Empty>,
     ) {
-        if let Err(e) = self.do_exec_process(req) {
+        if let Err(_) = self.do_exec_process(req) {
             let f = sink
                 .fail(RpcStatus::new(
                     RpcStatusCode::Internal,
-                    Some(format!("{}", e)),
+                    Some(String::from("fail to exec process!")),
                 ))
                 .map_err(|_e| error!(sl!(), "fail to exec process!"));
             ctx.spawn(f);
@@ -673,20 +630,7 @@ impl protocols::agent_grpc::AgentService for agentService {
         let s = Arc::clone(&self.sandbox);
         let mut sandbox = s.lock().unwrap();
 
-        let ctr: &mut LinuxContainer = match sandbox.get_container(cid.as_str()) {
-            Some(cr) => cr,
-            None => {
-                let f = sink
-                    .fail(RpcStatus::new(
-                        RpcStatusCode::InvalidArgument,
-                        Some(String::from("invalid container id")),
-                    ))
-                    .map_err(|_e| error!(sl!(), "invalid container id!"));
-                ctx.spawn(f);
-                return;
-            }
-        };
-
+        let ctr = sandbox.get_container(cid.as_str()).unwrap();
         let pids = ctr.processes().unwrap();
 
         match format.as_str() {
@@ -774,30 +718,17 @@ impl protocols::agent_grpc::AgentService for agentService {
         sink: ::grpcio::UnarySink<protocols::empty::Empty>,
     ) {
         let cid = req.container_id.clone();
-        let res = req.resources;
+        let res = req.resources.clone();
 
         let s = Arc::clone(&self.sandbox);
         let mut sandbox = s.lock().unwrap();
 
-        let ctr: &mut LinuxContainer = match sandbox.get_container(cid.as_str()) {
-            Some(cr) => cr,
-            None => {
-                let f = sink
-                    .fail(RpcStatus::new(
-                        RpcStatusCode::Internal,
-                        Some("invalid container id".to_string()),
-                    ))
-                    .map_err(|_e| error!(sl!(), "invalid container id!"));
-                ctx.spawn(f);
-                return;
-            }
-        };
+        let ctr = sandbox.get_container(cid.as_str()).unwrap();
 
         let resp = Empty::new();
 
         if res.is_some() {
-            let ociRes = rustjail::resources_grpc_to_oci(&res.unwrap());
-            match ctr.set(ociRes) {
+            match ctr.set(res.unwrap()) {
                 Err(_e) => {
                     let f = sink
                         .fail(RpcStatus::new(
@@ -829,19 +760,7 @@ impl protocols::agent_grpc::AgentService for agentService {
         let s = Arc::clone(&self.sandbox);
         let mut sandbox = s.lock().unwrap();
 
-        let ctr: &mut LinuxContainer = match sandbox.get_container(cid.as_str()) {
-            Some(cr) => cr,
-            None => {
-                let f = sink
-                    .fail(RpcStatus::new(
-                        RpcStatusCode::Internal,
-                        Some("invalid container id!".to_string()),
-                    ))
-                    .map_err(|_e| error!(sl!(), "invalid container id!"));
-                ctx.spawn(f);
-                return;
-            }
-        };
+        let ctr = sandbox.get_container(cid.as_str()).unwrap();
 
         let resp = match ctr.stats() {
             Err(_e) => {
@@ -996,19 +915,7 @@ impl protocols::agent_grpc::AgentService for agentService {
         let eid = req.exec_id.clone();
         let s = Arc::clone(&self.sandbox);
         let mut sandbox = s.lock().unwrap();
-        let p = match find_process(&mut sandbox, cid.as_str(), eid.as_str(), false) {
-            Ok(v) => v,
-            Err(e) => {
-                let f = sink
-                    .fail(RpcStatus::new(
-                        RpcStatusCode::InvalidArgument,
-                        Some(format!("invalid argument: {}", e)),
-                    ))
-                    .map_err(|_e| error!(sl!(), "invalid argument"));
-                ctx.spawn(f);
-                return;
-            }
-        };
+        let p = find_process(&mut sandbox, cid.as_str(), eid.as_str(), false).unwrap();
 
         if p.term_master.is_none() {
             let f = sink
@@ -1609,7 +1516,7 @@ fn find_process<'a>(
         None => return Err(ErrorKind::ErrorCode(String::from("Invalid container id")).into()),
     };
 
-    if init || eid == "" {
+    if init && eid == "" {
         let p = match ctr.processes.get_mut(&ctr.init_process_pid) {
             Some(v) => v,
             None => {
@@ -1672,7 +1579,7 @@ pub fn start<S: Into<String>>(sandbox: Arc<Mutex<Sandbox>>, host: S, port: u16)
 // sense to rely on the namespace path provided by the host since namespaces
 // are different inside the guest.
 fn update_container_namespaces(sandbox: &Sandbox, spec: &mut Spec) -> Result<()> {
-    let linux = match spec.linux.as_mut() {
+    let linux = match spec.Linux.as_mut() {
         None => {
             return Err(
                 ErrorKind::ErrorCode("Spec didn't container linux field".to_string()).into(),
@@ -1683,26 +1590,26 @@ fn update_container_namespaces(sandbox: &Sandbox, spec: &mut Spec) -> Result<()>
 
     let mut pidNs = false;
 
-    let namespaces = linux.namespaces.as_mut_slice();
+    let namespaces = linux.Namespaces.as_mut_slice();
     for namespace in namespaces.iter_mut() {
-        if namespace.r#type == NSTYPEPID {
+        if namespace.Type == NSTYPEPID {
             pidNs = true;
             continue;
         }
-        if namespace.r#type == NSTYPEIPC {
-            namespace.path = sandbox.shared_ipcns.path.clone();
+        if namespace.Type == NSTYPEIPC {
+            namespace.Path = sandbox.shared_ipcns.path.clone();
             continue;
         }
-        if namespace.r#type == NSTYPEUTS {
-            namespace.path = sandbox.shared_utsns.path.clone();
+        if namespace.Type == NSTYPEUTS {
+            namespace.Path = sandbox.shared_utsns.path.clone();
             continue;
         }
     }
 
     if !pidNs && !sandbox.sandbox_pid_ns {
-        let mut pid_ns = LinuxNamespace::default();
-        pid_ns.r#type = NSTYPEPID.to_string();
-        linux.namespaces.push(pid_ns);
+        let mut pid_ns = LinuxNamespace::new();
+        pid_ns.set_Type(NSTYPEPID.to_string());
+        linux.Namespaces.push(pid_ns);
     }
 
     Ok(())
@@ -1831,26 +1738,26 @@ fn do_copy_file(req: &CopyFileRequest) -> Result<()> {
     Ok(())
 }
 
-fn setup_bundle(spec: &Spec) -> Result<PathBuf> {
-    if spec.root.is_none() {
+fn setup_bundle(gspec: &Spec) -> Result<()> {
+    if gspec.Root.is_none() {
         return Err(nix::Error::Sys(Errno::EINVAL).into());
     }
-    let root = spec.root.as_ref().unwrap().path.as_str();
+    let root = gspec.Root.as_ref().unwrap().Path.as_str();
 
     let rootfs = fs::canonicalize(root)?;
     let bundle_path = rootfs.parent().unwrap().to_str().unwrap();
 
     let config = format!("{}/{}", bundle_path, "config.json");
 
+    let oci = rustjail::grpc_to_oci(gspec);
     info!(
         sl!(),
         "{:?}",
-        spec.process.as_ref().unwrap().console_size.as_ref()
+        oci.process.as_ref().unwrap().console_size.as_ref()
     );
-    let _ = spec.save(config.as_str());
+    let _ = oci.save(config.as_str());
 
-    let olddir = unistd::getcwd().chain_err(|| "cannot getcwd")?;
     unistd::chdir(bundle_path)?;
 
-    Ok(olddir)
+    Ok(())
 }

src/agent/src/linux_abi.rs

@@ -16,7 +16,7 @@ pub const SYSFS_PCI_BUS_RESCAN_FILE: &str = "/sys/bus/pci/rescan";
     target_arch = "x86"
 ))]
 pub const PCI_ROOT_BUS_PATH: &str = "/devices/pci0000:00";
-#[cfg(target_arch = "aarch64")]
+#[cfg(target_arch = "arm")]
 pub const PCI_ROOT_BUS_PATH: &str = "/devices/platform/4010000000.pcie/pci0000:00";
 
 pub const SYSFS_CPU_ONLINE_PATH: &str = "/sys/devices/system/cpu";

src/agent/src/logging.rs

@@ -2,8 +2,6 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 //
-#[macro_use]
-extern crate slog;
 
 use slog::{BorrowedKV, Drain, Key, OwnedKV, OwnedKVList, Record, KV};
 use std::collections::HashMap;
@@ -148,6 +146,12 @@ impl<D> RuntimeLevelFilter<D> {
             level: Mutex::new(level),
         }
     }
+
+    fn set_level(&self, level: slog::Level) {
+        let mut log_level = self.level.lock().unwrap();
+
+        *log_level = level;
+    }
 }
 
 impl<D> Drain for RuntimeLevelFilter<D>

src/agent/src/main.rs

@@ -10,26 +10,24 @@
 #![allow(non_snake_case)]
 #[macro_use]
 extern crate lazy_static;
-extern crate oci;
 extern crate prctl;
 extern crate protocols;
 extern crate regex;
 extern crate rustjail;
-extern crate scan_fmt;
 extern crate serde_json;
 extern crate signal_hook;
-
 #[macro_use]
-extern crate scopeguard;
+extern crate scan_fmt;
+extern crate oci;
 
 #[macro_use]
 extern crate slog;
+extern crate slog_async;
+extern crate slog_json;
 #[macro_use]
 extern crate netlink;
 
 use futures::*;
-use nix::fcntl::{self, OFlag};
-use nix::sys::socket::{self, AddressFamily, SockAddr, SockFlag, SockType};
 use nix::sys::wait::{self, WaitStatus};
 use nix::unistd;
 use prctl::set_child_subreaper;
@@ -37,7 +35,7 @@ use rustjail::errors::*;
 use signal_hook::{iterator::Signals, SIGCHLD};
 use std::collections::HashMap;
 use std::env;
-use std::fs::{self, File};
+use std::fs;
 use std::os::unix::fs as unixfs;
 use std::os::unix::io::AsRawFd;
 use std::path::Path;
@@ -49,6 +47,7 @@ use unistd::Pid;
 mod config;
 mod device;
 mod linux_abi;
+mod logging;
 mod mount;
 mod namespace;
 mod network;
@@ -100,27 +99,19 @@ fn announce(logger: &Logger) {
 
 fn main() -> Result<()> {
     let args: Vec<String> = env::args().collect();
-    if args.len() == 2 && args[1] == "init" {
-        rustjail::container::init_child();
-        exit(0);
-    }
 
     env::set_var("RUST_BACKTRACE", "full");
 
     lazy_static::initialize(&SHELLS);
 
     lazy_static::initialize(&AGENT_CONFIG);
-
-    // support vsock log
-    let (rfd, wfd) = unistd::pipe2(OFlag::O_CLOEXEC)?;
-    let writer = unsafe { File::from_raw_fd(wfd) };
-
     let agentConfig = AGENT_CONFIG.clone();
 
     if unistd::getpid() == Pid::from_raw(1) {
         // Init a temporary logger used by init agent as init process
         // since before do the base mount, it wouldn't access "/proc/cmdline"
         // to get the customzied debug level.
+        let writer = io::stdout();
         let logger = logging::create_logger(NAME, "agent", slog::Level::Debug, writer);
         init_agent_as_init(&logger)?;
     }
@@ -134,32 +125,7 @@ fn main() -> Result<()> {
     }
 
     let config = agentConfig.read().unwrap();
-    let log_vport = config.log_vport as u32;
-    let log_handle = thread::spawn(move || -> Result<()> {
-        let mut reader = unsafe { File::from_raw_fd(rfd) };
-        if log_vport > 0 {
-            let listenfd = socket::socket(
-                AddressFamily::Vsock,
-                SockType::Stream,
-                SockFlag::SOCK_CLOEXEC,
-                None,
-            )?;
-            let addr = SockAddr::new_vsock(libc::VMADDR_CID_ANY, log_vport);
-            socket::bind(listenfd, &addr)?;
-            socket::listen(listenfd, 1)?;
-            let datafd = socket::accept4(listenfd, SockFlag::SOCK_CLOEXEC)?;
-            let mut log_writer = unsafe { File::from_raw_fd(datafd) };
-            let _ = io::copy(&mut reader, &mut log_writer)?;
-            let _ = unistd::close(listenfd);
-            let _ = unistd::close(datafd);
-        }
-        // copy log to stdout
-        let mut stdout_writer = io::stdout();
-        let _ = io::copy(&mut reader, &mut stdout_writer)?;
-        Ok(())
-    });
-
-    let writer = unsafe { File::from_raw_fd(wfd) };
+    let writer = io::stdout();
     // Recreate a logger with the log level get from "/proc/cmdline".
     let logger = logging::create_logger(NAME, "agent", config.log_level, writer);
 
@@ -177,14 +143,13 @@ fn main() -> Result<()> {
     let _guard = slog_scope::set_global_logger(logger.new(o!("subsystem" => "grpc")));
 
     let shells = SHELLS.clone();
-    let debug_console_vport = config.debug_console_vport as u32;
 
     let shell_handle = if config.debug_console {
         let thread_logger = logger.clone();
 
         thread::spawn(move || {
             let shells = shells.lock().unwrap();
-            let result = setup_debug_console(shells.to_vec(), debug_console_vport);
+            let result = setup_debug_console(shells.to_vec());
             if result.is_err() {
                 // Report error, but don't fail
                 warn!(thread_logger, "failed to setup debug console";
@@ -231,7 +196,6 @@ fn main() -> Result<()> {
     // let _ = rx.wait();
 
     handle.join().unwrap();
-    let _ = log_handle.join();
 
     if config.debug_console {
         shell_handle.join().unwrap();
@@ -366,35 +330,18 @@ lazy_static! {
 // pub static mut TRACE_MODE: ;
 
 use crate::config::agentConfig;
+use nix::fcntl::{self, OFlag};
 use nix::sys::stat::Mode;
 use std::os::unix::io::{FromRawFd, RawFd};
 use std::path::PathBuf;
 use std::process::{exit, Command, Stdio};
 
-fn setup_debug_console(shells: Vec<String>, port: u32) -> Result<()> {
+fn setup_debug_console(shells: Vec<String>) -> Result<()> {
     for shell in shells.iter() {
         let binary = PathBuf::from(shell);
         if binary.exists() {
-            let f: RawFd = if port > 0 {
-                let listenfd = socket::socket(
-                    AddressFamily::Vsock,
-                    SockType::Stream,
-                    SockFlag::SOCK_CLOEXEC,
-                    None,
-                )?;
-                let addr = SockAddr::new_vsock(libc::VMADDR_CID_ANY, port);
-                socket::bind(listenfd, &addr)?;
-                socket::listen(listenfd, 1)?;
-                socket::accept4(listenfd, SockFlag::SOCK_CLOEXEC)?
-            } else {
-                let mut flags = OFlag::empty();
-                flags.insert(OFlag::O_RDWR);
-                flags.insert(OFlag::O_CLOEXEC);
-                fcntl::open(CONSOLE_PATH, flags, Mode::empty())?
-            };
-
+            let f: RawFd = fcntl::open(CONSOLE_PATH, OFlag::O_RDWR, Mode::empty())?;
             let cmd = Command::new(shell)
-                .arg("-i")
                 .stdin(unsafe { Stdio::from_raw_fd(f) })
                 .stdout(unsafe { Stdio::from_raw_fd(f) })
                 .stderr(unsafe { Stdio::from_raw_fd(f) })
@@ -434,7 +381,7 @@ mod tests {
         let mut shells = shells_ref.lock().unwrap();
         shells.clear();
 
-        let result = setup_debug_console(shells.to_vec(), 0);
+        let result = setup_debug_console(shells.to_vec());
 
         assert!(result.is_err());
         assert_eq!(result.unwrap_err().to_string(), "Error Code: 'no shell'");
@@ -457,7 +404,7 @@ mod tests {
 
         shells.push(shell);
 
-        let result = setup_debug_console(shells.to_vec(), 0);
+        let result = setup_debug_console(shells.to_vec());
 
         assert!(result.is_err());
         assert_eq!(

src/agent/src/namespace.rs

@@ -37,8 +37,6 @@ pub struct Namespace {
     pub path: String,
     persistent_ns_dir: String,
     ns_type: NamespaceType,
-    //only used for uts namespace
-    pub hostname: Option<String>,
 }
 
 impl Namespace {
@@ -48,7 +46,6 @@ impl Namespace {
             path: String::from(""),
             persistent_ns_dir: String::from(PERSISTENT_NS_DIR),
             ns_type: NamespaceType::IPC,
-            hostname: None,
         }
     }
 
@@ -57,11 +54,8 @@ impl Namespace {
         self
     }
 
-    pub fn as_uts(mut self, hostname: &str) -> Self {
+    pub fn as_uts(mut self) -> Self {
         self.ns_type = NamespaceType::UTS;
-        if hostname != "" {
-            self.hostname = Some(String::from(hostname));
-        }
         self
     }
 
@@ -88,7 +82,6 @@ impl Namespace {
         }
 
         self.path = new_ns_path.clone().into_os_string().into_string().unwrap();
-        let hostname = self.hostname.clone();
 
         let new_thread = thread::spawn(move || {
             let origin_ns_path = get_current_thread_ns_path(&ns_type.get());
@@ -105,12 +98,6 @@ impl Namespace {
                 return Err(err.to_string());
             }
 
-            if ns_type == NamespaceType::UTS && hostname.is_some() {
-                match nix::unistd::sethostname(hostname.unwrap()) {
-                    Err(err) => return Err(err.to_string()),
-                    Ok(_) => (),
-                }
-            }
             // Bind mount the new namespace from the current thread onto the mount point to persist it.
             let source: &str = origin_ns_path.as_str();
             let destination: &str = new_ns_path.as_path().to_str().unwrap_or("none");
@@ -149,7 +136,7 @@ impl Namespace {
 }
 
 /// Represents the Namespace type.
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Clone, Copy)]
 enum NamespaceType {
     IPC,
     UTS,
@@ -214,7 +201,7 @@ mod tests {
         let tmpdir = Builder::new().prefix("ipc").tempdir().unwrap();
 
         let ns_uts = Namespace::new(&logger)
-            .as_uts("test_hostname")
+            .as_uts()
             .set_root_dir(tmpdir.path().to_str().unwrap())
             .setup();
 

src/agent/src/sandbox.rs

@@ -97,22 +97,16 @@ impl Sandbox {
     //
     // It's assumed that caller is calling this method after
     // acquiring a lock on sandbox.
-    pub fn unset_sandbox_storage(&mut self, path: &str) -> Result<bool> {
+    pub fn unset_sandbox_storage(&mut self, path: &str) -> bool {
         match self.storages.get_mut(path) {
-            None => {
-                return Err(ErrorKind::ErrorCode(format!(
-                    "Sandbox storage with path {} not found",
-                    path
-                ))
-                .into())
-            }
+            None => return false,
             Some(count) => {
                 *count -= 1;
                 if *count < 1 {
                     self.storages.remove(path);
-                    return Ok(true);
+                    return true;
                 }
-                return Ok(false);
+                false
             }
         }
     }
@@ -136,15 +130,8 @@ impl Sandbox {
     // It's assumed that caller is calling this method after
     // acquiring a lock on sandbox.
     pub fn unset_and_remove_sandbox_storage(&mut self, path: &str) -> Result<()> {
-        match self.unset_sandbox_storage(path) {
-            Ok(res) => {
-                if res {
-                    return self.remove_sandbox_storage(path);
-                }
-            }
-            Err(err) => {
-                return Err(err);
-            }
+        if self.unset_sandbox_storage(path) {
+            return self.remove_sandbox_storage(path);
         }
         Ok(())
     }
@@ -171,10 +158,7 @@ impl Sandbox {
         };
 
         // // Set up shared UTS namespace
-        self.shared_utsns = match Namespace::new(&self.logger)
-            .as_uts(self.hostname.as_str())
-            .setup()
-        {
+        self.shared_utsns = match Namespace::new(&self.logger).as_uts().setup() {
             Ok(ns) => ns,
             Err(err) => {
                 return Err(ErrorKind::ErrorCode(format!(
@@ -278,279 +262,3 @@ fn online_memory(logger: &Logger) -> Result<()> {
     online_resources(logger, SYSFS_MEMORY_ONLINE_PATH, r"memory[0-9]+", -1)?;
     Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    //use rustjail::Error;
-    use super::Sandbox;
-    use crate::{mount::BareMount, skip_if_not_root};
-    use nix::mount::MsFlags;
-    use oci::{Linux, Root, Spec};
-    use rustjail::container::LinuxContainer;
-    use rustjail::specconv::CreateOpts;
-    use slog::Logger;
-    use tempfile::Builder;
-
-    fn bind_mount(src: &str, dst: &str, logger: &Logger) -> Result<(), rustjail::errors::Error> {
-        let baremount = BareMount::new(src, dst, "bind", MsFlags::MS_BIND, "", &logger);
-        baremount.mount()
-    }
-
-    #[test]
-    fn set_sandbox_storage() {
-        let logger = slog::Logger::root(slog::Discard, o!());
-        let mut s = Sandbox::new(&logger).unwrap();
-
-        let tmpdir = Builder::new().tempdir().unwrap();
-        let tmpdir_path = tmpdir.path().to_str().unwrap();
-
-        // Add a new sandbox storage
-        let new_storage = s.set_sandbox_storage(&tmpdir_path);
-
-        // Check the reference counter
-        let ref_count = s.storages[tmpdir_path];
-        assert_eq!(
-            ref_count, 1,
-            "Invalid refcount, got {} expected 1.",
-            ref_count
-        );
-        assert_eq!(new_storage, true);
-
-        // Use the existing sandbox storage
-        let new_storage = s.set_sandbox_storage(&tmpdir_path);
-        assert_eq!(new_storage, false, "Should be false as already exists.");
-
-        // Since we are using existing storage, the reference counter
-        // should be 2 by now.
-        let ref_count = s.storages[tmpdir_path];
-        assert_eq!(
-            ref_count, 2,
-            "Invalid refcount, got {} expected 2.",
-            ref_count
-        );
-    }
-
-    #[test]
-    fn remove_sandbox_storage() {
-        skip_if_not_root!();
-
-        let logger = slog::Logger::root(slog::Discard, o!());
-        let s = Sandbox::new(&logger).unwrap();
-
-        let tmpdir = Builder::new().tempdir().unwrap();
-        let tmpdir_path = tmpdir.path().to_str().unwrap();
-
-        let srcdir = Builder::new()
-            .prefix("src")
-            .tempdir_in(tmpdir_path)
-            .unwrap();
-        let srcdir_path = srcdir.path().to_str().unwrap();
-
-        let destdir = Builder::new()
-            .prefix("dest")
-            .tempdir_in(tmpdir_path)
-            .unwrap();
-        let destdir_path = destdir.path().to_str().unwrap();
-
-        let emptydir = Builder::new()
-            .prefix("empty")
-            .tempdir_in(tmpdir_path)
-            .unwrap();
-
-        assert!(
-            s.remove_sandbox_storage(&srcdir_path).is_err(),
-            "Expect Err as the directory i not a mountpoint"
-        );
-
-        assert!(s.remove_sandbox_storage("").is_err());
-
-        let invalid_dir = emptydir.path().join("invalid");
-
-        assert!(s
-            .remove_sandbox_storage(invalid_dir.to_str().unwrap())
-            .is_err());
-
-        // Now, create a double mount as this guarantees the directory cannot
-        // be deleted after the first umount.
-        for _i in 0..2 {
-            assert!(bind_mount(srcdir_path, destdir_path, &logger).is_ok());
-        }
-
-        assert!(
-            s.remove_sandbox_storage(destdir_path).is_err(),
-            "Expect fail as deletion cannot happen due to the second mount."
-        );
-
-        // This time it should work as the previous two calls have undone the double
-        // mount.
-        assert!(s.remove_sandbox_storage(destdir_path).is_ok());
-    }
-
-    #[test]
-    #[allow(unused_assignments)]
-    fn unset_and_remove_sandbox_storage() {
-        skip_if_not_root!();
-
-        let logger = slog::Logger::root(slog::Discard, o!());
-        let mut s = Sandbox::new(&logger).unwrap();
-
-        // FIX: This test fails, not sure why yet.
-        assert!(
-            s.unset_and_remove_sandbox_storage("/tmp/testEphePath")
-                .is_err(),
-            "Should fail because sandbox storage doesn't exist"
-        );
-
-        let tmpdir = Builder::new().tempdir().unwrap();
-        let tmpdir_path = tmpdir.path().to_str().unwrap();
-
-        let srcdir = Builder::new()
-            .prefix("src")
-            .tempdir_in(tmpdir_path)
-            .unwrap();
-        let srcdir_path = srcdir.path().to_str().unwrap();
-
-        let destdir = Builder::new()
-            .prefix("dest")
-            .tempdir_in(tmpdir_path)
-            .unwrap();
-        let destdir_path = destdir.path().to_str().unwrap();
-
-        assert!(bind_mount(srcdir_path, destdir_path, &logger).is_ok());
-
-        assert_eq!(s.set_sandbox_storage(&destdir_path), true);
-        assert!(s.unset_and_remove_sandbox_storage(&destdir_path).is_ok());
-
-        let mut other_dir_str = String::new();
-        {
-            // Create another folder in a separate scope to ensure that is
-            // deleted
-            let other_dir = Builder::new()
-                .prefix("dir")
-                .tempdir_in(tmpdir_path)
-                .unwrap();
-            let other_dir_path = other_dir.path().to_str().unwrap();
-            other_dir_str = other_dir_path.to_string();
-
-            assert_eq!(s.set_sandbox_storage(&other_dir_path), true);
-        }
-
-        assert!(s.unset_and_remove_sandbox_storage(&other_dir_str).is_err());
-    }
-
-    #[test]
-    fn unset_sandbox_storage() {
-        let logger = slog::Logger::root(slog::Discard, o!());
-        let mut s = Sandbox::new(&logger).unwrap();
-
-        let storage_path = "/tmp/testEphe";
-
-        // Add a new sandbox storage
-        assert_eq!(s.set_sandbox_storage(&storage_path), true);
-        // Use the existing sandbox storage
-        assert_eq!(
-            s.set_sandbox_storage(&storage_path),
-            false,
-            "Expects false as the storage is not new."
-        );
-
-        assert_eq!(
-            s.unset_sandbox_storage(&storage_path).unwrap(),
-            false,
-            "Expects false as there is still a storage."
-        );
-
-        // Reference counter should decrement to 1.
-        let ref_count = s.storages[storage_path];
-        assert_eq!(
-            ref_count, 1,
-            "Invalid refcount, got {} expected 1.",
-            ref_count
-        );
-
-        assert_eq!(
-            s.unset_sandbox_storage(&storage_path).unwrap(),
-            true,
-            "Expects true as there is still a storage."
-        );
-
-        // Since no container is using this sandbox storage anymore
-        // there should not be any reference in sandbox struct
-        // for the given storage
-        assert!(
-            !s.storages.contains_key(storage_path),
-            "The storages map should not contain the key {}",
-            storage_path
-        );
-
-        // If no container is using the sandbox storage, the reference
-        // counter for it should not exist.
-        assert!(
-            s.unset_sandbox_storage(&storage_path).is_err(),
-            "Expects false as the reference counter should no exist."
-        );
-    }
-
-    fn create_dummy_opts() -> CreateOpts {
-        let mut root = Root::default();
-        root.path = String::from("/");
-
-        let linux = Linux::default();
-        let mut spec = Spec::default();
-        spec.root = Some(root).into();
-        spec.linux = Some(linux).into();
-
-        CreateOpts {
-            cgroup_name: "".to_string(),
-            use_systemd_cgroup: false,
-            no_pivot_root: false,
-            no_new_keyring: false,
-            spec: Some(spec),
-            rootless_euid: false,
-            rootless_cgroup: false,
-        }
-    }
-
-    fn create_linuxcontainer() -> LinuxContainer {
-        LinuxContainer::new(
-            "some_id",
-            "/run/agent",
-            create_dummy_opts(),
-            &slog_scope::logger(),
-        )
-        .unwrap()
-    }
-
-    #[test]
-    fn get_container_entry_exist() {
-        skip_if_not_root!();
-        let logger = slog::Logger::root(slog::Discard, o!());
-        let mut s = Sandbox::new(&logger).unwrap();
-        let linux_container = create_linuxcontainer();
-
-        s.containers
-            .insert("testContainerID".to_string(), linux_container);
-        let cnt = s.get_container("testContainerID");
-        assert!(cnt.is_some());
-    }
-
-    #[test]
-    fn get_container_no_entry() {
-        let logger = slog::Logger::root(slog::Discard, o!());
-        let mut s = Sandbox::new(&logger).unwrap();
-
-        let cnt = s.get_container("testContainerID");
-        assert!(cnt.is_none());
-    }
-
-    #[test]
-    fn add_and_get_container() {
-        skip_if_not_root!();
-        let logger = slog::Logger::root(slog::Discard, o!());
-        let mut s = Sandbox::new(&logger).unwrap();
-        let linux_container = create_linuxcontainer();
-
-        s.add_container(linux_container);
-        assert!(s.get_container("some_id").is_some());
-    }
-}