optimize sandbox directory structure #38
Conversation
| let bundle = format!("{}/{}", sandbox.base_dir, self.container_id); | ||
| let bundle = format!( | ||
| "{}/{}/{}/{}", | ||
| sandbox.base_dir, "shared", self.container_id, "bundle" |
There was a problem hiding this comment.
Shoud we define some const variables to replace "shared" and ''bundle"?
vmm/task/src/container.rs
Outdated
| @@ -118,7 +118,7 @@ impl ContainerFactory<KuasarContainer> for KuasarFactory { | |||
| req: &CreateTaskRequest, | |||
| ) -> containerd_shim::Result<KuasarContainer> { | |||
| rescan_pci_bus().await?; | |||
| let bundle = format!("{}/{}", KUASAR_STATE_DIR, req.id); | |||
| let bundle = format!("{}{}/{}", KUASAR_STATE_DIR, req.id, "bundle"); | |||
There was a problem hiding this comment.
Did you miss a '/' ?
format!("{}/{}/{}", KUASAR_STATE_DIR, req.id, "bundle");
There was a problem hiding this comment.
Because KUASAR_STATE_DIR is defined as "/run/kuasar/state/", with the last '/', so i deleted '/' here......
But maybe it should not ended with ‘/’, I'll optimize it together.
Vanient
force-pushed
the
main
branch
2 times, most recently
from
2654e8e
to
a1f4c5a
Compare
vmm/task/src/container.rs
Outdated
| @@ -118,7 +118,7 @@ impl ContainerFactory<KuasarContainer> for KuasarFactory { | |||
| req: &CreateTaskRequest, | |||
| ) -> containerd_shim::Result<KuasarContainer> { | |||
| rescan_pci_bus().await?; | |||
| let bundle = format!("{}/{}", KUASAR_STATE_DIR, req.id); | |||
| let bundle = format!("{}{}/{}", KUASAR_STATE_DIR, req.id, "bundle"); | |||
There was a problem hiding this comment.
As we assume that the bundle is only path that the task server can get, I think maybe it is enough to leave the path what it is, without a "bundle" subpath.
vmm/sandbox/src/storage/mod.rs
Outdated
| ) -> Result<()> { | ||
| if device_id.is_some() { | ||
| self.vm.hot_detach(&device_id.unwrap()).await?; | ||
| } else if fs_type == "bind" { | ||
| let mount_point = format!("{}/{}", self.base_dir, id); | ||
| let mount_point = format!("{}/{}/{}/{}", self.base_dir, "shared", container_id, id); |
There was a problem hiding this comment.
As the storage is in the scope of pod( or sandbox), we can not mount the storage to a specific container path.
vmm/sandbox/src/storage/mod.rs
Outdated
| @@ -158,7 +158,10 @@ where | |||
| } else { | |||
| m.source.clone() | |||
| }; | |||
| let host_dest = format!("{}/{}", self.base_dir, &storage_id); | |||
| let host_dest = format!( | |||
There was a problem hiding this comment.
As the storage is in the scope of pod( or sandbox), we can not mount the storage to a specific container path.
vmm/sandbox/src/storage/mod.rs
Outdated
| @@ -186,7 +189,7 @@ where | |||
| driver_options: vec![], | |||
| fstype: "bind".to_string(), | |||
| options: vec![], | |||
| mount_point: format!("{}{}", KUASAR_STATE_DIR, &storage_id), | |||
| mount_point: format!("{}{}/{}", KUASAR_STATE_DIR, &container_id, &storage_id), | |||
There was a problem hiding this comment.
As the storage is in the scope of pod( or sandbox), we can not mount the storage to a specific container path.
vmm/sandbox/src/storage/mod.rs
Outdated
| @@ -264,15 +270,15 @@ where | |||
| Ok(()) | |||
| } | |||
|
|
|||
| async fn gc_storages(&mut self) -> Result<()> { | |||
| async fn gc_storages(&mut self, container_id: &str) -> Result<()> { | |||
There was a problem hiding this comment.
maybe this container_id param is not necessary if we do not relate any storage to a specific container, storage is in the scope of sandbox.
As we just need to mount guest needed directory and files to guest, other files like console sock and sandbox.json should not be mounted into guest, so we create a shared directory to store those needed by guest and mount it only. after optimizing: /kuasar/d691426a7c2407fee8de3a09aca38e282acffde838fd001d1b2416ebf834d947/ ├── console.sock ├── sandbox-d691426a7c2407fee8de3a09aca38e282acffde838fd001d1b2416ebf834d947.log ├── sandbox-d691426a7c2407fee8de3a09aca38e282acffde838fd001d1b2416ebf834d947.pid ├── sandbox.json ├── shared │ ├── 677c691aa0ca843fc3131458512fea56de1fbf01983e7478e60a4e0a28a31108 │ │ ├── config.json │ │ ├── init.pid │ │ └── log.json │ ├── storage1 │ │ ├── bin │ │ ├── dev │ │ ├── etc │ │ ├── home │ │ ├── proc │ │ ├── root │ │ ├── sys │ │ ├── tmp │ │ ├── usr │ │ └── var │ ├── storage10 │ ├── storage8 │ └── storage9 ├── virtiofs.log └── virtiofs.sock Signed-off-by: Vanient <[email protected]>
Before this, container bundle directory was initialized and created in spec handler, but it was used by storage handler and io handler which before spec handler, bundle directory was still "" in storage handler and io handler, which caused files were created under "/". So we should initialize and create bundle directory in metadata add handler which is before all other ones. Signed-off-by: Vanient <[email protected]>
|
LGTM |
after optimizing:
Before this, container bundle directory was initialized and created in spec handler, but it was used by storage handler and io handler which before spec handler, bundle directory was still "" in storage handler and io handler, which caused files were created under "/". So we should initialize and create bundle directory in metadata add handler which is before all other ones.