From a0bde8db934dbe0982575642de699bce58e22ff7 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 4 Mar 2024 18:07:34 +0000 Subject: [PATCH 001/176] add logging image pulling --- image-rs/src/image.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 1a747ae42..c72f24b1d 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -98,6 +98,9 @@ impl Default for ImageClient { // construct a default instance of `ImageClient` fn default() -> ImageClient { let config = ImageConfig::try_from(Path::new(CONFIGURATION_FILE_PATH)).unwrap_or_default(); + + println!("KS-image-rs: Starting ImageClient with config: ({:?})", config); + let meta_store = MetaStore::try_from(Path::new(METAFILE)).unwrap_or_default(); #[allow(unused_mut)] @@ -114,6 +117,8 @@ impl Default for ImageClient { data_dir, std::sync::atomic::AtomicUsize::new(*overlay_index), ); + + println!("KS-image-rs: Starting overlayfs snapshotter"); snapshots.insert( SnapshotType::Overlay, Box::new(overlayfs) as Box, @@ -232,6 +237,7 @@ impl ImageClient { (false, true) => RegistryAuth::Anonymous, _ => auth.expect("unexpected uninitialized auth"), }; + println!("KS-image-rs: Instantiating PullClient"); let mut client = PullClient::new( reference, @@ -239,8 +245,12 @@ impl ImageClient { &auth, self.config.max_concurrent_download, )?; + println!("KS-image-rs: B3G1N: Pull Manifest ({:?})", image_url); + let (image_manifest, image_digest, image_config) = client.pull_manifest().await?; + println!("KS-image-rs: END: Pull Manifest ({:?})", image_url); + let id = image_manifest.config.digest.clone(); let snapshot = match self.snapshots.get_mut(&self.config.default_snapshot) { @@ -303,6 +313,7 @@ impl ImageClient { #[cfg(feature = "signature")] if self.config.security_validate { + println!("KS-image-rs: B3G1N: Signature Validation ({:?})", image_url); crate::signature::allows_image( image_url, &image_digest, @@ -311,6 +322,7 @@ impl ImageClient { ) .await .map_err(|e| anyhow!("Security validate failed: {:?}", e))?; + println!("KS-image-rs: END: Signature Validation ({:?})", image_url); } let (mut image_data, unique_layers, unique_diff_ids) = create_image_meta( @@ -373,6 +385,8 @@ impl ImageClient { bail!("Failed to get bootstrap id, diff_ids is empty"); }; + println!("KS-image-rs: END: Do nydus bootstrap pull ({:?})", image_manifest); + let bootstrap = utils::get_nydus_bootstrap_desc(image_manifest) .ok_or_else(|| anyhow!("Faild to get bootstrap oci descriptor"))?; let layer_metas = client @@ -383,6 +397,8 @@ impl ImageClient { self.meta_store.clone(), ) .await?; + println!("KS-image-rs: END: Do nydus bootstrap pull ({:?})", image_manifest); + image_data.layer_metas = vec![layer_metas]; let layer_db: HashMap = image_data .layer_metas @@ -411,6 +427,7 @@ impl ImageClient { ); } }; + println!("KS-image-rs: Starting nydus service"); let image_id = service::start_nydus_service( image_data, reference, From 6bf0e78a24677b181c0662ef9638e6a2a3b14558 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 5 Mar 2024 15:03:03 +0000 Subject: [PATCH 002/176] logg nydus image check --- image-rs/src/image.rs | 4 +++- image-rs/src/nydus/utils.rs | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index c72f24b1d..a20b4330a 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -265,6 +265,7 @@ impl ImageClient { #[cfg(feature = "nydus")] if utils::is_nydus_image(&image_manifest) { + println!("KS-image-rs: Nydus image detected"); { let m = self.meta_store.lock().await; if let Some(image_data) = &m.image_db.get(&id) { @@ -291,7 +292,7 @@ impl ImageClient { &image_digest, &image_config, )?; - + println!("KS-image-rs: B3G1N: Nydus image pull"); return self .do_pull_image_with_nydus( &mut client, @@ -301,6 +302,7 @@ impl ImageClient { bundle_dir, ) .await; + println!("KS-image-rs: END: Nydus image pull"); } // If image has already been populated, just create the bundle. diff --git a/image-rs/src/nydus/utils.rs b/image-rs/src/nydus/utils.rs index cae497b22..8a9ab9021 100644 --- a/image-rs/src/nydus/utils.rs +++ b/image-rs/src/nydus/utils.rs @@ -20,6 +20,8 @@ pub fn is_nydus_meta_layer(desc: &manifest::OciDescriptor) -> bool { } pub fn is_nydus_image(image_manifest: &manifest::OciImageManifest) -> bool { + + println!("KS-image-rs: Checking if image is nydus"); get_nydus_bootstrap_desc(image_manifest).is_some() } From bf8e1226caddf7738ca35c9de9bf4f5f5138a264 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 5 Mar 2024 19:42:35 +0000 Subject: [PATCH 003/176] patched Cargo.toml kata-cc-native-tls to not include overlay-fs --- image-rs/Cargo.toml | 4 +++- image-rs/src/image.rs | 1 + image-rs/src/nydus/utils.rs | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index d599bad79..153090268 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -81,11 +81,13 @@ default = ["snapshot-overlayfs", "signature-cosign-rustls", "keywrap-grpc", "oci # This will be based on `ring` dependency kata-cc-rustls-tls = ["encryption-ring", "keywrap-ttrpc", "snapshot-overlayfs", "signature-cosign-rustls", "signature-simple", "getresource", "oci-distribution/rustls-tls"] + enclave-cc-eaakbc-rustls-tls = ["encryption-ring", "keywrap-native", "eaa-kbc", "snapshot-unionfs", "signature-simple", "getresource", "signature-cosign-rustls", "oci-distribution-rustls"] enclave-cc-cckbc-rustls-tls = ["encryption-ring", "keywrap-native", "cc-kbc-sgx", "snapshot-unionfs", "signature-simple", "getresource", "signature-cosign-rustls", "oci-distribution-rustls"] # This will be based on `openssl` dependency -kata-cc-native-tls = ["encryption-openssl", "keywrap-ttrpc", "snapshot-overlayfs", "signature-cosign-native", "signature-simple", "getresource", "oci-distribution/native-tls"] +#kata-cc-native-tls = ["encryption-openssl", "keywrap-ttrpc", "snapshot-overlayfs", "signature-cosign-native", "signature-simple", "getresource", "oci-distribution/native-tls"] +kata-cc-native-tls = ["encryption-openssl", "keywrap-ttrpc", "signature-cosign-native", "signature-simple", "getresource", "oci-distribution/native-tls"] enclave-cc-eaakbc-native-tls = ["encryption-openssl", "keywrap-native", "eaa-kbc", "snapshot-unionfs", "signature-simple", "getresource", "signature-cosign-native", "oci-distribution-native"] enclave-cc-cckbc-native-tls = ["encryption-openssl", "keywrap-native", "cc-kbc-sgx", "snapshot-unionfs", "signature-simple", "getresource", "signature-cosign-native", "oci-distribution-native"] diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index a20b4330a..4de480aa4 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -171,6 +171,7 @@ impl ImageClient { auth_info: &Option<&str>, decrypt_config: &Option<&str>, ) -> Result { + println!("KS-image-rs: pull_image called"); let reference = Reference::try_from(image_url)?; // Try to get auth using input param. diff --git a/image-rs/src/nydus/utils.rs b/image-rs/src/nydus/utils.rs index 8a9ab9021..be0a7267e 100644 --- a/image-rs/src/nydus/utils.rs +++ b/image-rs/src/nydus/utils.rs @@ -34,9 +34,11 @@ pub fn get_nydus_bootstrap_desc( if is_nydus_meta_layer(desc) { Some(desc.clone()) } else { + println!("KS-image-rs: is nydus meta layers == false"); None } } else { + println!("KS-image-rs: layers is empty. Not a nydus image"); None } } From 65fc28bcf3c1365ba70a610b5a6cc3ba908689d9 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Wed, 6 Mar 2024 15:16:01 +0000 Subject: [PATCH 004/176] add nix dep to nydus feature deps --- .gitignore | 2 ++ image-rs/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 13efc081e..e067394c2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,7 @@ .DS_Store +.vscode + image-rs/scripts/attestation-agent shell.nix diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 153090268..f7f2cdd81 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -122,6 +122,6 @@ snapshot-unionfs = ["nix", "dircpy", "fs_extra"] getresource = [ "lazy_static", "cfg-if" ] -nydus = ["lazy_static", "nydus-api", "nydus-service"] +nydus = ["nix", "lazy_static", "nydus-api", "nydus-service"] verity = ["devicemapper"] From 677c2e021c26e2e7db81b7a54df7e6d7a9aad880 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 22 Mar 2024 11:02:59 +0000 Subject: [PATCH 005/176] update toml to include overlay-fs --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index f7f2cdd81..8fcca8c57 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -86,8 +86,8 @@ enclave-cc-eaakbc-rustls-tls = ["encryption-ring", "keywrap-native", "eaa-kbc", enclave-cc-cckbc-rustls-tls = ["encryption-ring", "keywrap-native", "cc-kbc-sgx", "snapshot-unionfs", "signature-simple", "getresource", "signature-cosign-rustls", "oci-distribution-rustls"] # This will be based on `openssl` dependency -#kata-cc-native-tls = ["encryption-openssl", "keywrap-ttrpc", "snapshot-overlayfs", "signature-cosign-native", "signature-simple", "getresource", "oci-distribution/native-tls"] -kata-cc-native-tls = ["encryption-openssl", "keywrap-ttrpc", "signature-cosign-native", "signature-simple", "getresource", "oci-distribution/native-tls"] +kata-cc-native-tls = ["encryption-openssl", "keywrap-ttrpc", "snapshot-overlayfs", "signature-cosign-native", "signature-simple", "getresource", "oci-distribution/native-tls"] +#kata-cc-native-tls = ["encryption-openssl", "keywrap-ttrpc", "signature-cosign-native", "signature-simple", "getresource", "oci-distribution/native-tls"] enclave-cc-eaakbc-native-tls = ["encryption-openssl", "keywrap-native", "eaa-kbc", "snapshot-unionfs", "signature-simple", "getresource", "signature-cosign-native", "oci-distribution-native"] enclave-cc-cckbc-native-tls = ["encryption-openssl", "keywrap-native", "cc-kbc-sgx", "snapshot-unionfs", "signature-simple", "getresource", "signature-cosign-native", "oci-distribution-native"] From 28f05b942fb1eb2ac0154d383f80d7b8329ded5d Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 22 Mar 2024 14:53:07 +0000 Subject: [PATCH 006/176] logging layer and image db entries after pull --- image-rs/src/image.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 4de480aa4..6a5cfd0a8 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -310,6 +310,7 @@ impl ImageClient { { let m = self.meta_store.lock().await; if let Some(image_data) = &m.image_db.get(&id) { + println!("KS-image-rs: meta_store already populated with ({:?})", image_data); return create_bundle(image_data, bundle_dir, snapshot); } } @@ -337,6 +338,7 @@ impl ImageClient { )?; let unique_layers_len = unique_layers.len(); + println!("KS-image-rs: B3G1N: Calling async_pull_layers"); let layer_metas = client .async_pull_layers( unique_layers, @@ -345,6 +347,7 @@ impl ImageClient { self.meta_store.clone(), ) .await?; + println!("KS-image-rs: END: Calling async_pull_layers"); image_data.layer_metas = layer_metas; let layer_db: HashMap = image_data @@ -354,6 +357,12 @@ impl ImageClient { .collect(); self.meta_store.lock().await.layer_db.extend(layer_db); + + + for (key, value) in &layer_db { + println!("KS-image-rs layer_db entry: {} => {}", key, value); + } + if unique_layers_len != image_data.layer_metas.len() { bail!( " {} layers failed to pull", @@ -369,6 +378,14 @@ impl ImageClient { .image_db .insert(image_data.id.clone(), image_data.clone()); + + + let meta_store_lock = meta_store.lock().await; + for (key, value) in meta_store_lock.image_db.iter() { + println!("KS-image-rs image_db entry: {} => {:?}", key, value); + } + + Ok(image_id) } From aa23c326ff3dd44801a397f3f8082e470f439777 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 22 Mar 2024 15:29:50 +0000 Subject: [PATCH 007/176] layer_db display bug --- image-rs/src/image.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 6a5cfd0a8..cb024f477 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -360,7 +360,7 @@ impl ImageClient { for (key, value) in &layer_db { - println!("KS-image-rs layer_db entry: {} => {}", key, value); + println!("KS-image-rs layer_db entry: {} => {:?}", key, value); } if unique_layers_len != image_data.layer_metas.len() { From 753c8c3f67fe5fc4a9b43548b8ca06c108502370 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 22 Mar 2024 16:04:14 +0000 Subject: [PATCH 008/176] bug fix --- image-rs/src/image.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index cb024f477..35f465a2c 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -380,7 +380,7 @@ impl ImageClient { - let meta_store_lock = meta_store.lock().await; + let meta_store_lock = self.meta_store.lock().await; for (key, value) in meta_store_lock.image_db.iter() { println!("KS-image-rs image_db entry: {} => {:?}", key, value); } From fa68ad9f3a54222064f8bfed35e95c4cd7704998 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 22 Mar 2024 16:17:03 +0000 Subject: [PATCH 009/176] bug fix --- image-rs/src/image.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 35f465a2c..8140c269e 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -356,12 +356,11 @@ impl ImageClient { .map(|layer| (layer.compressed_digest.clone(), layer.clone())) .collect(); - self.meta_store.lock().await.layer_db.extend(layer_db); - + for (key, value) in layer_db.clone() { + println!("KS-image-rs layer_db entry: {} => {:?}", key, value); + } - for (key, value) in &layer_db { - println!("KS-image-rs layer_db entry: {} => {:?}", key, value); - } + self.meta_store.lock().await.layer_db.extend(layer_db); if unique_layers_len != image_data.layer_metas.len() { bail!( From 5380ca082ca5298a195eed5dce625ba26ab7113b Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 23 Mar 2024 15:15:21 +0000 Subject: [PATCH 010/176] add fuse deamon logs --- image-rs/src/image.rs | 6 ++---- image-rs/src/nydus/service.rs | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 8140c269e..d06bcaa2e 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -303,7 +303,6 @@ impl ImageClient { bundle_dir, ) .await; - println!("KS-image-rs: END: Nydus image pull"); } // If image has already been populated, just create the bundle. @@ -338,7 +337,7 @@ impl ImageClient { )?; let unique_layers_len = unique_layers.len(); - println!("KS-image-rs: B3G1N: Calling async_pull_layers"); + println!("KS-image-rs: Calling async_pull_layers"); let layer_metas = client .async_pull_layers( unique_layers, @@ -347,7 +346,6 @@ impl ImageClient { self.meta_store.clone(), ) .await?; - println!("KS-image-rs: END: Calling async_pull_layers"); image_data.layer_metas = layer_metas; let layer_db: HashMap = image_data @@ -404,7 +402,7 @@ impl ImageClient { bail!("Failed to get bootstrap id, diff_ids is empty"); }; - println!("KS-image-rs: END: Do nydus bootstrap pull ({:?})", image_manifest); + println!("KS-image-rs: B3G1N: Do nydus bootstrap pull ({:?})", image_manifest); let bootstrap = utils::get_nydus_bootstrap_desc(image_manifest) .ok_or_else(|| anyhow!("Faild to get bootstrap oci descriptor"))?; diff --git a/image-rs/src/nydus/service.rs b/image-rs/src/nydus/service.rs index 3631301bf..d314745c9 100644 --- a/image-rs/src/nydus/service.rs +++ b/image-rs/src/nydus/service.rs @@ -50,6 +50,7 @@ pub async fn start_nydus_service( let work_dir_buf = work_dir.to_owned(); if nydus_config.is_fuse() { + println!("KS-image-rs: fuse mode detected"); let fuse_config = nydus_config .get_fuse_config() .expect("Fuse configuration not found") @@ -69,6 +70,7 @@ pub async fn start_nydus_service( bail!("Failed to start nydus service, {:?}", e); }; } else if nydus_config.is_fscache() { + println!("KS-image-rs: fscache mode detected"); let fscache_config = nydus_config .get_fscache_config() .expect("Fscache configuration not found") @@ -167,6 +169,7 @@ pub fn process_fuse_daemon( reference.repository(), work_dir.join("cache"), ); + println!("KS-image-rs: process_fuse_deamon called, with config ({:?}), bootstrap ({:?}), mountpoint ({:?}), workdir ({:?}) and fuse_config ({:?})", config, bootstrap, mountpoint, work_dir, fuse_config); if !mountpoint.exists() { std::fs::create_dir_all(mountpoint)?; From 294734a1525c7a4cdcc7db303455cdd65787d401 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 30 Mar 2024 14:03:16 +0000 Subject: [PATCH 011/176] log cleanup for experiments --- image-rs/src/image.rs | 24 ++++++++++++++---------- image-rs/src/pull.rs | 10 +++++++--- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index d06bcaa2e..dd46ef272 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -246,11 +246,11 @@ impl ImageClient { &auth, self.config.max_concurrent_download, )?; - println!("KS-image-rs: B3G1N: Pull Manifest ({:?})", image_url); + println!("CSG-M4GIC: B3G1N: (KS-image-rs) Pull Manifest"); let (image_manifest, image_digest, image_config) = client.pull_manifest().await?; - println!("KS-image-rs: END: Pull Manifest ({:?})", image_url); + println!("CSG-M4GIC: END: (KS-image-rs) Pull Manifest"); let id = image_manifest.config.digest.clone(); @@ -293,8 +293,8 @@ impl ImageClient { &image_digest, &image_config, )?; - println!("KS-image-rs: B3G1N: Nydus image pull"); - return self + println!("CSG-M4GIC: B3G1N: (KS-image-rs) Nydus Image Pull"); + let ret = self .do_pull_image_with_nydus( &mut client, &mut image_data, @@ -303,6 +303,8 @@ impl ImageClient { bundle_dir, ) .await; + println!("CSG-M4GIC: END: (KS-image-rs) Nydus Image Pull"); + return ret } // If image has already been populated, just create the bundle. @@ -316,7 +318,7 @@ impl ImageClient { #[cfg(feature = "signature")] if self.config.security_validate { - println!("KS-image-rs: B3G1N: Signature Validation ({:?})", image_url); + println!("CSG-M4GIC: B3G1N: (KS-image-rs) Signature Validation"); crate::signature::allows_image( image_url, &image_digest, @@ -325,7 +327,7 @@ impl ImageClient { ) .await .map_err(|e| anyhow!("Security validate failed: {:?}", e))?; - println!("KS-image-rs: END: Signature Validation ({:?})", image_url); + println!("CSG-M4GIC: END: (KS-image-rs) Signature Validation"); } let (mut image_data, unique_layers, unique_diff_ids) = create_image_meta( @@ -402,7 +404,7 @@ impl ImageClient { bail!("Failed to get bootstrap id, diff_ids is empty"); }; - println!("KS-image-rs: B3G1N: Do nydus bootstrap pull ({:?})", image_manifest); + println!("CSG-M4GIC: B3G1N: (KS-image-rs) Nydus Bootstrap Pull"); let bootstrap = utils::get_nydus_bootstrap_desc(image_manifest) .ok_or_else(|| anyhow!("Faild to get bootstrap oci descriptor"))?; @@ -414,8 +416,9 @@ impl ImageClient { self.meta_store.clone(), ) .await?; - println!("KS-image-rs: END: Do nydus bootstrap pull ({:?})", image_manifest); - + println!("CSG-M4GIC: END: (KS-image-rs) Nydus Bootstrap Pull"); + + println!("CSG-M4GIC: B3G1N: (KS-image-rs) Handle Bootstrap"); image_data.layer_metas = vec![layer_metas]; let layer_db: HashMap = image_data .layer_metas @@ -441,7 +444,7 @@ impl ImageClient { bail!( "default snapshot {} not found", &self.config.default_snapshot - ); + ); } }; println!("KS-image-rs: Starting nydus service"); @@ -461,6 +464,7 @@ impl ImageClient { .image_db .insert(image_data.id.clone(), image_data.clone()); + println!("CSG-M4GIC: END: (KS-image-rs) Handle Bootstrap"); Ok(image_id) } } diff --git a/image-rs/src/pull.rs b/image-rs/src/pull.rs index b555b233b..f2fec2cd5 100644 --- a/image-rs/src/pull.rs +++ b/image-rs/src/pull.rs @@ -100,20 +100,24 @@ impl<'a> PullClient<'a> { let ms = meta_store.clone(); async move { + println!("CSG-M4GIC: B3G1N: Pull Single Layer ({:?})", layer_digest); let layer_reader = client .async_pull_blob(reference, &layer.digest) .await .map_err(|e| anyhow!("failed to async pull blob {}", e.to_string()))?; + println!("CSG-M4GIC: END: Pull Single Layer ({:?})", layer_digest); - self.async_handle_layer( + println!("CSG-M4GIC: B3G1N: Handle Single Layer ({:?})", layer_digest); + let tmp = self.async_handle_layer( layer, diff_ids[i].clone(), decrypt_config, layer_reader, ms, ) - .await - .map_err(|e| anyhow!("failed to handle layer: {:?}", e)) + .await; + println!("CSG-M4GIC: END: Handle Single Layer ({:?})", layer_digest); + tmp.map_err(|e| anyhow!("failed to handle layer: {:?}", e)) } }) .buffer_unordered(self.max_concurrent_download) From 3889b102f6e7563acd1b15de4048c9d4809ce6f4 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 30 Mar 2024 14:42:21 +0000 Subject: [PATCH 012/176] layer digest bugfix --- image-rs/src/pull.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/image-rs/src/pull.rs b/image-rs/src/pull.rs index f2fec2cd5..d4e3ce388 100644 --- a/image-rs/src/pull.rs +++ b/image-rs/src/pull.rs @@ -100,6 +100,7 @@ impl<'a> PullClient<'a> { let ms = meta_store.clone(); async move { + let layer_digest = layer.digest.clone(); println!("CSG-M4GIC: B3G1N: Pull Single Layer ({:?})", layer_digest); let layer_reader = client .async_pull_blob(reference, &layer.digest) From 4d7f884669c955ede30148751db0f5ef2d010adf Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 30 Mar 2024 16:31:39 +0000 Subject: [PATCH 013/176] Pull Layers log --- image-rs/src/image.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index dd46ef272..07c58c980 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -339,7 +339,7 @@ impl ImageClient { )?; let unique_layers_len = unique_layers.len(); - println!("KS-image-rs: Calling async_pull_layers"); + println!("CSG-M4GIC: B3G1N: Pull Layers ({:?})", image_url); let layer_metas = client .async_pull_layers( unique_layers, @@ -348,6 +348,7 @@ impl ImageClient { self.meta_store.clone(), ) .await?; + println!("CSG-M4GIC: END: Pull Layers ({:?})", image_url); image_data.layer_metas = layer_metas; let layer_db: HashMap = image_data From a6738c90ca26e48a427a8ef46b10b5df907aec3d Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 15 Apr 2024 20:33:15 +0000 Subject: [PATCH 014/176] comment out extra logs for experiments --- image-rs/src/image.rs | 44 +++++++++++++++++------------------ image-rs/src/nydus/service.rs | 6 ++--- image-rs/src/nydus/utils.rs | 4 ++-- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 07c58c980..c7e1f5d76 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -99,7 +99,7 @@ impl Default for ImageClient { fn default() -> ImageClient { let config = ImageConfig::try_from(Path::new(CONFIGURATION_FILE_PATH)).unwrap_or_default(); - println!("KS-image-rs: Starting ImageClient with config: ({:?})", config); + //println!("KS-image-rs: Starting ImageClient with config: ({:?})", config); let meta_store = MetaStore::try_from(Path::new(METAFILE)).unwrap_or_default(); @@ -118,7 +118,7 @@ impl Default for ImageClient { std::sync::atomic::AtomicUsize::new(*overlay_index), ); - println!("KS-image-rs: Starting overlayfs snapshotter"); + //println!("KS-image-rs: Starting overlayfs snapshotter"); snapshots.insert( SnapshotType::Overlay, Box::new(overlayfs) as Box, @@ -171,7 +171,7 @@ impl ImageClient { auth_info: &Option<&str>, decrypt_config: &Option<&str>, ) -> Result { - println!("KS-image-rs: pull_image called"); + //println!("KS-image-rs: pull_image called"); let reference = Reference::try_from(image_url)?; // Try to get auth using input param. @@ -238,7 +238,7 @@ impl ImageClient { (false, true) => RegistryAuth::Anonymous, _ => auth.expect("unexpected uninitialized auth"), }; - println!("KS-image-rs: Instantiating PullClient"); + //println!("KS-image-rs: Instantiating PullClient"); let mut client = PullClient::new( reference, @@ -246,11 +246,11 @@ impl ImageClient { &auth, self.config.max_concurrent_download, )?; - println!("CSG-M4GIC: B3G1N: (KS-image-rs) Pull Manifest"); + //println!("CSG-M4GIC: B3G1N: (KS-image-rs) Pull Manifest"); let (image_manifest, image_digest, image_config) = client.pull_manifest().await?; - println!("CSG-M4GIC: END: (KS-image-rs) Pull Manifest"); + //println!("CSG-M4GIC: END: (KS-image-rs) Pull Manifest"); let id = image_manifest.config.digest.clone(); @@ -293,7 +293,7 @@ impl ImageClient { &image_digest, &image_config, )?; - println!("CSG-M4GIC: B3G1N: (KS-image-rs) Nydus Image Pull"); + //println!("CSG-M4GIC: B3G1N: (KS-image-rs) Nydus Image Pull"); let ret = self .do_pull_image_with_nydus( &mut client, @@ -303,7 +303,7 @@ impl ImageClient { bundle_dir, ) .await; - println!("CSG-M4GIC: END: (KS-image-rs) Nydus Image Pull"); + //println!("CSG-M4GIC: END: (KS-image-rs) Nydus Image Pull"); return ret } @@ -311,7 +311,7 @@ impl ImageClient { { let m = self.meta_store.lock().await; if let Some(image_data) = &m.image_db.get(&id) { - println!("KS-image-rs: meta_store already populated with ({:?})", image_data); + //println!("KS-image-rs: meta_store already populated with ({:?})", image_data); return create_bundle(image_data, bundle_dir, snapshot); } } @@ -339,7 +339,7 @@ impl ImageClient { )?; let unique_layers_len = unique_layers.len(); - println!("CSG-M4GIC: B3G1N: Pull Layers ({:?})", image_url); + //println!("CSG-M4GIC: B3G1N: Pull Layers ({:?})", image_url); let layer_metas = client .async_pull_layers( unique_layers, @@ -348,7 +348,7 @@ impl ImageClient { self.meta_store.clone(), ) .await?; - println!("CSG-M4GIC: END: Pull Layers ({:?})", image_url); + //println!("CSG-M4GIC: END: Pull Layers ({:?})", image_url); image_data.layer_metas = layer_metas; let layer_db: HashMap = image_data @@ -357,9 +357,9 @@ impl ImageClient { .map(|layer| (layer.compressed_digest.clone(), layer.clone())) .collect(); - for (key, value) in layer_db.clone() { - println!("KS-image-rs layer_db entry: {} => {:?}", key, value); - } + // for (key, value) in layer_db.clone() { + // println!("KS-image-rs layer_db entry: {} => {:?}", key, value); + // } self.meta_store.lock().await.layer_db.extend(layer_db); @@ -381,9 +381,9 @@ impl ImageClient { let meta_store_lock = self.meta_store.lock().await; - for (key, value) in meta_store_lock.image_db.iter() { - println!("KS-image-rs image_db entry: {} => {:?}", key, value); - } + // for (key, value) in meta_store_lock.image_db.iter() { + // println!("KS-image-rs image_db entry: {} => {:?}", key, value); + // } Ok(image_id) @@ -405,7 +405,7 @@ impl ImageClient { bail!("Failed to get bootstrap id, diff_ids is empty"); }; - println!("CSG-M4GIC: B3G1N: (KS-image-rs) Nydus Bootstrap Pull"); + //println!("CSG-M4GIC: B3G1N: (KS-image-rs) Nydus Bootstrap Pull"); let bootstrap = utils::get_nydus_bootstrap_desc(image_manifest) .ok_or_else(|| anyhow!("Faild to get bootstrap oci descriptor"))?; @@ -417,9 +417,9 @@ impl ImageClient { self.meta_store.clone(), ) .await?; - println!("CSG-M4GIC: END: (KS-image-rs) Nydus Bootstrap Pull"); + //println!("CSG-M4GIC: END: (KS-image-rs) Nydus Bootstrap Pull"); - println!("CSG-M4GIC: B3G1N: (KS-image-rs) Handle Bootstrap"); + //println!("CSG-M4GIC: B3G1N: (KS-image-rs) Handle Bootstrap"); image_data.layer_metas = vec![layer_metas]; let layer_db: HashMap = image_data .layer_metas @@ -448,7 +448,7 @@ impl ImageClient { ); } }; - println!("KS-image-rs: Starting nydus service"); + //println!("KS-image-rs: Starting nydus service"); let image_id = service::start_nydus_service( image_data, reference, @@ -465,7 +465,7 @@ impl ImageClient { .image_db .insert(image_data.id.clone(), image_data.clone()); - println!("CSG-M4GIC: END: (KS-image-rs) Handle Bootstrap"); + //println!("CSG-M4GIC: END: (KS-image-rs) Handle Bootstrap"); Ok(image_id) } } diff --git a/image-rs/src/nydus/service.rs b/image-rs/src/nydus/service.rs index d314745c9..54e960f22 100644 --- a/image-rs/src/nydus/service.rs +++ b/image-rs/src/nydus/service.rs @@ -50,7 +50,7 @@ pub async fn start_nydus_service( let work_dir_buf = work_dir.to_owned(); if nydus_config.is_fuse() { - println!("KS-image-rs: fuse mode detected"); + //println!("KS-image-rs: fuse mode detected"); let fuse_config = nydus_config .get_fuse_config() .expect("Fuse configuration not found") @@ -70,7 +70,7 @@ pub async fn start_nydus_service( bail!("Failed to start nydus service, {:?}", e); }; } else if nydus_config.is_fscache() { - println!("KS-image-rs: fscache mode detected"); + //println!("KS-image-rs: fscache mode detected"); let fscache_config = nydus_config .get_fscache_config() .expect("Fscache configuration not found") @@ -169,7 +169,7 @@ pub fn process_fuse_daemon( reference.repository(), work_dir.join("cache"), ); - println!("KS-image-rs: process_fuse_deamon called, with config ({:?}), bootstrap ({:?}), mountpoint ({:?}), workdir ({:?}) and fuse_config ({:?})", config, bootstrap, mountpoint, work_dir, fuse_config); + //println!("KS-image-rs: process_fuse_deamon called, with config ({:?}), bootstrap ({:?}), mountpoint ({:?}), workdir ({:?}) and fuse_config ({:?})", config, bootstrap, mountpoint, work_dir, fuse_config); if !mountpoint.exists() { std::fs::create_dir_all(mountpoint)?; diff --git a/image-rs/src/nydus/utils.rs b/image-rs/src/nydus/utils.rs index be0a7267e..5bf2a34c3 100644 --- a/image-rs/src/nydus/utils.rs +++ b/image-rs/src/nydus/utils.rs @@ -21,7 +21,7 @@ pub fn is_nydus_meta_layer(desc: &manifest::OciDescriptor) -> bool { pub fn is_nydus_image(image_manifest: &manifest::OciImageManifest) -> bool { - println!("KS-image-rs: Checking if image is nydus"); + //println!("KS-image-rs: Checking if image is nydus"); get_nydus_bootstrap_desc(image_manifest).is_some() } @@ -38,7 +38,7 @@ pub fn get_nydus_bootstrap_desc( None } } else { - println!("KS-image-rs: layers is empty. Not a nydus image"); + //println!("KS-image-rs: layers is empty. Not a nydus image"); None } } From 6ce002175884be92e90631e45a3626c159614236 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Wed, 17 Apr 2024 10:23:39 +0000 Subject: [PATCH 015/176] comment out layer pull --- image-rs/src/pull.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/image-rs/src/pull.rs b/image-rs/src/pull.rs index d4e3ce388..309e99a63 100644 --- a/image-rs/src/pull.rs +++ b/image-rs/src/pull.rs @@ -101,14 +101,14 @@ impl<'a> PullClient<'a> { async move { let layer_digest = layer.digest.clone(); - println!("CSG-M4GIC: B3G1N: Pull Single Layer ({:?})", layer_digest); + //println!("CSG-M4GIC: B3G1N: Pull Single Layer ({:?})", layer_digest); let layer_reader = client .async_pull_blob(reference, &layer.digest) .await .map_err(|e| anyhow!("failed to async pull blob {}", e.to_string()))?; - println!("CSG-M4GIC: END: Pull Single Layer ({:?})", layer_digest); + //println!("CSG-M4GIC: END: Pull Single Layer ({:?})", layer_digest); - println!("CSG-M4GIC: B3G1N: Handle Single Layer ({:?})", layer_digest); + //println!("CSG-M4GIC: B3G1N: Handle Single Layer ({:?})", layer_digest); let tmp = self.async_handle_layer( layer, diff_ids[i].clone(), @@ -117,7 +117,7 @@ impl<'a> PullClient<'a> { ms, ) .await; - println!("CSG-M4GIC: END: Handle Single Layer ({:?})", layer_digest); + //println!("CSG-M4GIC: END: Handle Single Layer ({:?})", layer_digest); tmp.map_err(|e| anyhow!("failed to handle layer: {:?}", e)) } }) From 67728528ba8e361b005c827616e3686db9f79cfd Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 21 Apr 2024 13:29:58 +0000 Subject: [PATCH 016/176] dm verity logs --- image-rs/src/verity/dmverity.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index d7c2e8847..57513fdec 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -137,6 +137,7 @@ pub fn create_verity_device( verity_option: &DmVerityOption, source_device_path: &Path, ) -> Result { + println!("CSG-M4GIC: B3G1N: (KS-image-rs) create_verity_device, path: ({:?}), option: ({:?})", source_device_path, verity_option); let dm = DM::new()?; let verity_name = DmName::new(&verity_option.hash)?; let id = DevId::Name(verity_name); @@ -173,6 +174,7 @@ pub fn create_verity_device( verity_option.hash, "-", ); + println!("CSG-M4GIC: (KS-image-rs) dm_verity params: ({:?})", verity_params); // Mapping table in device mapper: : // is 0 // is size of device in sectors, and one sector is equal to 512 bytes. @@ -186,9 +188,11 @@ pub fn create_verity_device( )]; dm.device_create(verity_name, None, opts)?; + println!("CSG-M4GIC: (KS-image-rs) verity device created"); dm.table_load(&id, verity_table.as_slice(), opts)?; dm.device_suspend(&id, opts)?; + println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); Ok(format!("/dev/mapper/{}", &verity_option.hash)) } From 709013319777001c2cffe900ae8af9f497aeeca0 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 21 Apr 2024 22:07:43 +0000 Subject: [PATCH 017/176] add dm verity creation error --- image-rs/src/verity/dmverity.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 57513fdec..f186fec18 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -187,7 +187,18 @@ pub fn create_verity_device( verity_params, )]; - dm.device_create(verity_name, None, opts)?; + //dm.device_create(verity_name, None, opts)?; + + match dm.device_create(verity_name, None, opts) { + Ok(_) => { + println!("CSG-M4GIC: (KS-image-rs) Device created successfully."); + Ok(()) + }, + Err(e) => { + println!("CSG-M4GIC: (KS-image-rs) Error occurred: {}", e); + Err(e) + } + println!("CSG-M4GIC: (KS-image-rs) verity device created"); dm.table_load(&id, verity_table.as_slice(), opts)?; dm.device_suspend(&id, opts)?; From 8cad985a4dd22c2a20a35f0223aa3b0ae4beabb9 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 21 Apr 2024 22:14:29 +0000 Subject: [PATCH 018/176] add dm verity creation error --- image-rs/src/verity/dmverity.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index f186fec18..841407136 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -198,6 +198,7 @@ pub fn create_verity_device( println!("CSG-M4GIC: (KS-image-rs) Error occurred: {}", e); Err(e) } + } println!("CSG-M4GIC: (KS-image-rs) verity device created"); dm.table_load(&id, verity_table.as_slice(), opts)?; From ade4c1c9394d0c3b2bee2afc616dd154e80b0a53 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 21 Apr 2024 22:27:38 +0000 Subject: [PATCH 019/176] add dm verity creation error --- image-rs/src/verity/dmverity.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 841407136..80a34970c 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -188,16 +188,11 @@ pub fn create_verity_device( )]; //dm.device_create(verity_name, None, opts)?; + let result = dm.device_create(verity_name, None, opts); - match dm.device_create(verity_name, None, opts) { - Ok(_) => { - println!("CSG-M4GIC: (KS-image-rs) Device created successfully."); - Ok(()) - }, - Err(e) => { - println!("CSG-M4GIC: (KS-image-rs) Error occurred: {}", e); - Err(e) - } + if let Err(e) = result { + println!("CSG-M4GIC: (KS-image-rs) Error occurred while creating device: {}", e); + result.unwrap(); } println!("CSG-M4GIC: (KS-image-rs) verity device created"); From feb51c834b50c6033c5c9c982486f1f0b48afb98 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 21 Apr 2024 22:33:13 +0000 Subject: [PATCH 020/176] add dm verity creation error --- image-rs/src/verity/dmverity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 80a34970c..9c8f45b42 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -190,7 +190,7 @@ pub fn create_verity_device( //dm.device_create(verity_name, None, opts)?; let result = dm.device_create(verity_name, None, opts); - if let Err(e) = result { + if let Err(ref e) = result { println!("CSG-M4GIC: (KS-image-rs) Error occurred while creating device: {}", e); result.unwrap(); } From 9789e6fc52abd1364644f72b51f341a1832618b3 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Thu, 2 May 2024 10:11:19 +0000 Subject: [PATCH 021/176] dm daemon start commands --- image-rs/src/verity/dmverity.rs | 52 +++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 9c8f45b42..738a1e3fe 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -8,6 +8,8 @@ use devicemapper::{DevId, DmFlags, DmName, DmOptions, DM}; use serde::{Deserialize, Serialize}; use serde_json; use std::path::Path; +use std::str; +use std::process::Command; /// Configuration information for DmVerity device. #[derive(Debug, Deserialize, Serialize)] @@ -129,6 +131,54 @@ impl TryFrom<&String> for DmVerityOption { } } +fn start_udev() { + let check_udev = Command::new("pgrep") + .args(&["-x", "systemd-udevd"]) + .output() + .expect("KS (image-rs) Failed to execute pgrep"); + + if check_udev.status.success() { + println!("KS (image-rs) udev daemon is already running."); + println!("KS (image-rs) pgrep output: {}", str::from_utf8(&check_udev.stdout).unwrap()); + } else { + println!("KS (image-rs) udev daemon is not running."); + println!("KS (image-rs) pgrep stderr: {}", str::from_utf8(&check_udev.stderr).unwrap()); + println!("KS (image-rs) Attempting to start udev..."); + + let cmds = [ + "/lib/systemd/systemd-udevd --daemon", + "udevadm trigger", + "udevadm settle", + ]; + for cmd in cmds.iter() { + let output = Command::new("sh") + .arg("-c") + .arg(cmd) + .output() + .expect("KS (image-rs) Failed to execute udev command"); + + if output.status.success() { + println!("KS (image-rs) Command '{}' executed successfully.", cmd); + } else { + eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); + } + } + let check_udev = Command::new("pgrep") + .args(&["-x", "systemd-udevd"]) + .output() + .expect("KS (image-rs) Failed to execute pgrep"); + + if check_udev.status.success() { + println!("KS (image-rs) udev daemon sucesfully started."); + println!("KS (image-rs) pgrep output: {}", str::from_utf8(&check_udev.stdout).unwrap()); + } else { + println!("KS (image-rs) udev daemon not started."); + println!("KS (image-rs) pgrep stderr: {}", str::from_utf8(&check_udev.stderr).unwrap()); + } + } +} + + /// Creates a mapping with backed by data_device /// and using hash_device for in-kernel verification. /// It will return the verity block device Path "/dev/mapper/" @@ -175,6 +225,8 @@ pub fn create_verity_device( "-", ); println!("CSG-M4GIC: (KS-image-rs) dm_verity params: ({:?})", verity_params); + + start_udev(); // Mapping table in device mapper: : // is 0 // is size of device in sectors, and one sector is equal to 512 bytes. From 9eaadbd43040af6be12577059d6544c81ab5559c Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 10:18:15 +0000 Subject: [PATCH 022/176] udev/control access --- image-rs/src/verity/dmverity.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 738a1e3fe..f960a8a3d 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -10,6 +10,7 @@ use serde_json; use std::path::Path; use std::str; use std::process::Command; +use nix::unistd::{access, AccessFlags}; /// Configuration information for DmVerity device. #[derive(Debug, Deserialize, Serialize)] @@ -131,6 +132,14 @@ impl TryFrom<&String> for DmVerityOption { } } +fn udev_running() -> bool { + const UDEV_SOCKET_PATH: &str = "/run/udev/control"; + matches!( + access(Path::new(UDEV_SOCKET_PATH), AccessFlags::F_OK), + Ok(()) + ) +} + fn start_udev() { let check_udev = Command::new("pgrep") .args(&["-x", "systemd-udevd"]) @@ -175,6 +184,11 @@ fn start_udev() { println!("KS (image-rs) udev daemon not started."); println!("KS (image-rs) pgrep stderr: {}", str::from_utf8(&check_udev.stderr).unwrap()); } + if udev_running() { + println!("udev/control is accessible."); + } else { + println!("udev/control is NOT accessible."); + } } } From 4e41d8a925a4a0d5506ce76160921da18cbb2673 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 10:39:09 +0000 Subject: [PATCH 023/176] udev/control access --- image-rs/src/verity/dmverity.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index f960a8a3d..ca660bb91 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -184,11 +184,11 @@ fn start_udev() { println!("KS (image-rs) udev daemon not started."); println!("KS (image-rs) pgrep stderr: {}", str::from_utf8(&check_udev.stderr).unwrap()); } - if udev_running() { - println!("udev/control is accessible."); - } else { - println!("udev/control is NOT accessible."); - } + } + if udev_running() { + println!("udev/control is accessible."); + } else { + println!("udev/control is NOT accessible."); } } From 6cbc9920b58dd3f4953c62b5d4718582dc7752eb Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 10:49:02 +0000 Subject: [PATCH 024/176] udev/control access --- image-rs/src/verity/dmverity.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index ca660bb91..dc532ef5a 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -186,9 +186,9 @@ fn start_udev() { } } if udev_running() { - println!("udev/control is accessible."); + println!("KS udev/control is accessible."); } else { - println!("udev/control is NOT accessible."); + println!("KS udev/control is NOT accessible."); } } From 6bfb09c0e6e945b67bc9b22fd16dbfb21d9535d4 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 11:46:35 +0000 Subject: [PATCH 025/176] dm tabel lload logs --- image-rs/src/verity/dmverity.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index dc532ef5a..e02c37078 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -261,8 +261,11 @@ pub fn create_verity_device( result.unwrap(); } - println!("CSG-M4GIC: (KS-image-rs) verity device created"); + println!("(KS-image-rs) verity device created"); dm.table_load(&id, verity_table.as_slice(), opts)?; + + println!("(KS-image-rs) verity table loaded"); + dm.device_suspend(&id, opts)?; println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); From 0d290931b61b0b3a8083d12af43f0f5d31b5fab1 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 13:06:32 +0000 Subject: [PATCH 026/176] dm tabel load error handling --- image-rs/src/verity/dmverity.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index e02c37078..62f7ca14b 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -254,16 +254,21 @@ pub fn create_verity_device( )]; //dm.device_create(verity_name, None, opts)?; - let result = dm.device_create(verity_name, None, opts); + dm.device_create(verity_name, None, opts); + + // if let Err(ref e) = result { + // println!("CSG-M4GIC: (KS-image-rs) Error occurred while creating device: {}", e); + // result.unwrap(); + // } + + println!("(KS-image-rs) verity device created"); + let result = dm.table_load(&id, verity_table.as_slice(), opts)?; if let Err(ref e) = result { - println!("CSG-M4GIC: (KS-image-rs) Error occurred while creating device: {}", e); + println!("CSG-M4GIC: (KS-image-rs) Error occurred while loading table: {}", e); result.unwrap(); } - println!("(KS-image-rs) verity device created"); - dm.table_load(&id, verity_table.as_slice(), opts)?; - println!("(KS-image-rs) verity table loaded"); dm.device_suspend(&id, opts)?; From 73c8005f74fa97caf80db0bb82fd53d0e1ca9269 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 13:10:33 +0000 Subject: [PATCH 027/176] dm tabel load error handling --- image-rs/src/verity/dmverity.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 62f7ca14b..4fb1b9165 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -262,12 +262,9 @@ pub fn create_verity_device( // } println!("(KS-image-rs) verity device created"); - let result = dm.table_load(&id, verity_table.as_slice(), opts)?; + device_info = dm.table_load(&id, verity_table.as_slice(), opts)?; - if let Err(ref e) = result { - println!("CSG-M4GIC: (KS-image-rs) Error occurred while loading table: {}", e); - result.unwrap(); - } + println!("CSG-M4GIC: (KS-image-rs) Loaded table with dev info: {:?}", device_info); println!("(KS-image-rs) verity table loaded"); From 4c63321cdc330508c865be26835a72ea8f996f72 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 13:12:10 +0000 Subject: [PATCH 028/176] dm tabel load error handling --- image-rs/src/verity/dmverity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 4fb1b9165..b764357f5 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -262,7 +262,7 @@ pub fn create_verity_device( // } println!("(KS-image-rs) verity device created"); - device_info = dm.table_load(&id, verity_table.as_slice(), opts)?; + let device_info = dm.table_load(&id, verity_table.as_slice(), opts)?; println!("CSG-M4GIC: (KS-image-rs) Loaded table with dev info: {:?}", device_info); From cbe48ee8ea1efc1f8ee9f8d1a627d6c4a2e5b1fd Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 13:55:27 +0000 Subject: [PATCH 029/176] tmp --- image-rs/src/verity/dmverity.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index b764357f5..7a70c11e1 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -262,9 +262,9 @@ pub fn create_verity_device( // } println!("(KS-image-rs) verity device created"); - let device_info = dm.table_load(&id, verity_table.as_slice(), opts)?; + //let device_info = dm.table_load(&id, verity_table.as_slice(), opts)?; - println!("CSG-M4GIC: (KS-image-rs) Loaded table with dev info: {:?}", device_info); + //println!("CSG-M4GIC: (KS-image-rs) Loaded table with dev info: {:?}", device_info); println!("(KS-image-rs) verity table loaded"); From 286c38c22e82d96ba630a2a6dc5feab3aba1ac2f Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 13:58:59 +0000 Subject: [PATCH 030/176] tmp --- image-rs/src/verity/dmverity.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 7a70c11e1..7a724740e 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -246,12 +246,13 @@ pub fn create_verity_device( // is size of device in sectors, and one sector is equal to 512 bytes. // is name of mapping target, here "verity" for dm-verity // are parameters for verity target - let verity_table = vec![( - 0, - verity_option.blocknum * verity_option.blocksize / 512, - "verity".into(), - verity_params, - )]; + + //let verity_table = vec![( + // 0, + // verity_option.blocknum * verity_option.blocksize / 512, + // "verity".into(), + // verity_params, + //)]; //dm.device_create(verity_name, None, opts)?; dm.device_create(verity_name, None, opts); From 78df2b34e6ee677e7278a6896c3e164ea5ce8798 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 14:51:04 +0000 Subject: [PATCH 031/176] tmp --- image-rs/src/verity/dmverity.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 7a724740e..869d7438a 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -263,6 +263,19 @@ pub fn create_verity_device( // } println!("(KS-image-rs) verity device created"); + + let cmd = "ls /dev/mapper" + let output = Command::new("sh") + .arg("-c") + .arg(cmd) + .output() + .expect("KS (image-rs) Failed to execute 'ls' command"); + + if output.status.success() { + println!("KS (image-rs) Command '{}' executed successfully.", cmd); + } else { + eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); + } //let device_info = dm.table_load(&id, verity_table.as_slice(), opts)?; //println!("CSG-M4GIC: (KS-image-rs) Loaded table with dev info: {:?}", device_info); From b86f709995940e374efad7b031ad8b9fea71577f Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 14:55:02 +0000 Subject: [PATCH 032/176] tmp --- image-rs/src/verity/dmverity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 869d7438a..cda2365b0 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -264,7 +264,7 @@ pub fn create_verity_device( println!("(KS-image-rs) verity device created"); - let cmd = "ls /dev/mapper" + let cmd = "ls /dev/mapper"; let output = Command::new("sh") .arg("-c") .arg(cmd) From 818f1fc52d5a5b26510ae989d1f85022a0f49581 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 15:43:38 +0000 Subject: [PATCH 033/176] tmp --- image-rs/src/verity/dmverity.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index cda2365b0..37b8d8d92 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -272,7 +272,9 @@ pub fn create_verity_device( .expect("KS (image-rs) Failed to execute 'ls' command"); if output.status.success() { + let stdout = str::from_utf8(&output.stdout).unwrap(); println!("KS (image-rs) Command '{}' executed successfully.", cmd); + println!("Output:\n{}", stdout); } else { eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); } From f4c155771dd4643b9c820b4ce173b622e2943785 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 15:55:27 +0000 Subject: [PATCH 034/176] tmp --- image-rs/src/verity/dmverity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 37b8d8d92..1f513c726 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -274,7 +274,7 @@ pub fn create_verity_device( if output.status.success() { let stdout = str::from_utf8(&output.stdout).unwrap(); println!("KS (image-rs) Command '{}' executed successfully.", cmd); - println!("Output:\n{}", stdout); + println!("KS (image-rs) Output:\n{}", stdout); } else { eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); } From f8bb493274c146e83a3dd74cb07b62d6badcd493 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 16:04:25 +0000 Subject: [PATCH 035/176] tmp --- image-rs/src/verity/dmverity.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 1f513c726..ecf863328 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -262,9 +262,9 @@ pub fn create_verity_device( // result.unwrap(); // } - println!("(KS-image-rs) verity device created"); + println!("KS (image-rs) verity device created"); - let cmd = "ls /dev/mapper"; + let cmd = "ls /dev/vda"; let output = Command::new("sh") .arg("-c") .arg(cmd) @@ -274,15 +274,15 @@ pub fn create_verity_device( if output.status.success() { let stdout = str::from_utf8(&output.stdout).unwrap(); println!("KS (image-rs) Command '{}' executed successfully.", cmd); - println!("KS (image-rs) Output:\n{}", stdout); + println!("KS (image-rs) 'ls' Output:\n{}", stdout); } else { eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); } - //let device_info = dm.table_load(&id, verity_table.as_slice(), opts)?; + let device_info = dm.table_load(&id, verity_table.as_slice(), opts)?; - //println!("CSG-M4GIC: (KS-image-rs) Loaded table with dev info: {:?}", device_info); + println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); - println!("(KS-image-rs) verity table loaded"); + println!("KS (image-rs) verity table loaded"); dm.device_suspend(&id, opts)?; From b1fe80c706e7c2693a000be54b6e83773b1bfcf0 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 16:05:27 +0000 Subject: [PATCH 036/176] tmp --- image-rs/src/verity/dmverity.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index ecf863328..606e52633 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -247,12 +247,12 @@ pub fn create_verity_device( // is name of mapping target, here "verity" for dm-verity // are parameters for verity target - //let verity_table = vec![( - // 0, - // verity_option.blocknum * verity_option.blocksize / 512, - // "verity".into(), - // verity_params, - //)]; + let verity_table = vec![( + 0, + verity_option.blocknum * verity_option.blocksize / 512, + "verity".into(), + verity_params, + )]; //dm.device_create(verity_name, None, opts)?; dm.device_create(verity_name, None, opts); From 0aa81e9fe25d14be539ba9d8ace3c7ad5f80d870 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 16:12:19 +0000 Subject: [PATCH 037/176] tmp --- image-rs/src/verity/dmverity.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 606e52633..f3059266d 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -278,9 +278,9 @@ pub fn create_verity_device( } else { eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); } - let device_info = dm.table_load(&id, verity_table.as_slice(), opts)?; + dm.table_load(&id, verity_table.as_slice(), opts)?; - println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); + //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); println!("KS (image-rs) verity table loaded"); From e809efab9d9c2bbb9b976a94712d783d36bb0663 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 16:20:31 +0000 Subject: [PATCH 038/176] tmp --- image-rs/src/verity/dmverity.rs | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index f3059266d..9e6394058 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -262,9 +262,10 @@ pub fn create_verity_device( // result.unwrap(); // } + println!("KS (image-rs) verity device created"); - let cmd = "ls /dev/vda"; + let cmd = "ls /dev/mapper"; let output = Command::new("sh") .arg("-c") .arg(cmd) @@ -278,12 +279,31 @@ pub fn create_verity_device( } else { eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); } + + dm.table_load(&id, verity_table.as_slice(), opts)?; //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); println!("KS (image-rs) verity table loaded"); + //////// + let cmd = "ls /dev/mapper"; + let output = Command::new("sh") + .arg("-c") + .arg(cmd) + .output() + .expect("KS (image-rs) Failed to execute 'ls' command"); + + if output.status.success() { + let stdout = str::from_utf8(&output.stdout).unwrap(); + println!("KS (image-rs) Command '{}' executed successfully.", cmd); + println!("KS (image-rs) 'ls' Output:\n{}", stdout); + } else { + eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); + } + //////// + dm.device_suspend(&id, opts)?; println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); From 1b1c7c367fe908fdf2f30b1453fb8a992e0e46d2 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 17:20:16 +0000 Subject: [PATCH 039/176] tmp --- image-rs/src/verity/dmverity.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 9e6394058..2db533a08 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -304,7 +304,16 @@ pub fn create_verity_device( } //////// - dm.device_suspend(&id, opts)?; + //dm.device_suspend(&id, opts)?; + let result = dm.device_suspend(&id, opts); + match result { + Ok(device_info) => { + println!("KS (image-rs) Device suspended successfully. Device info: {:?}", device_info); + }, + Err(e) => { + println!("KS (image-rs) Error occurred while trying to suspend device: {:?}", e); + } + } println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); Ok(format!("/dev/mapper/{}", &verity_option.hash)) From 58d66542dadde43b4d6467384593ba3b332c8978 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 19:06:41 +0000 Subject: [PATCH 040/176] tmp --- image-rs/src/verity/dmverity.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 2db533a08..78ef85daf 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -265,7 +265,7 @@ pub fn create_verity_device( println!("KS (image-rs) verity device created"); - let cmd = "ls /dev/mapper"; + let cmd = "ls /"; let output = Command::new("sh") .arg("-c") .arg(cmd) @@ -281,7 +281,7 @@ pub fn create_verity_device( } - dm.table_load(&id, verity_table.as_slice(), opts)?; + //dm.table_load(&id, verity_table.as_slice(), opts)?; //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); From 39b9011a2bdfdf9492d4addac852305d1ffe37bd Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 19:08:01 +0000 Subject: [PATCH 041/176] tmp --- image-rs/src/verity/dmverity.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 78ef85daf..58efb087e 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -247,12 +247,12 @@ pub fn create_verity_device( // is name of mapping target, here "verity" for dm-verity // are parameters for verity target - let verity_table = vec![( - 0, - verity_option.blocknum * verity_option.blocksize / 512, - "verity".into(), - verity_params, - )]; + //let verity_table = vec![( + // 0, + // verity_option.blocknum * verity_option.blocksize / 512, + // "verity".into(), + // verity_params, + //)]; //dm.device_create(verity_name, None, opts)?; dm.device_create(verity_name, None, opts); From 43a4430c8ddf63afb9b4c2464a7c748201bff65d Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 20:29:21 +0000 Subject: [PATCH 042/176] tmp --- image-rs/src/verity/dmverity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 58efb087e..2813cdddb 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -304,7 +304,7 @@ pub fn create_verity_device( } //////// - //dm.device_suspend(&id, opts)?; + dm.device_suspend(&id, opts)?; let result = dm.device_suspend(&id, opts); match result { Ok(device_info) => { From 091f2e1e7c39088300599924312be84ff4306786 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 20:31:36 +0000 Subject: [PATCH 043/176] tmp --- image-rs/src/verity/dmverity.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 2813cdddb..ca5685127 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -247,12 +247,12 @@ pub fn create_verity_device( // is name of mapping target, here "verity" for dm-verity // are parameters for verity target - //let verity_table = vec![( - // 0, - // verity_option.blocknum * verity_option.blocksize / 512, - // "verity".into(), - // verity_params, - //)]; + let verity_table = vec![( + 0, + verity_option.blocknum * verity_option.blocksize / 512, + "verity".into(), + verity_params, + )]; //dm.device_create(verity_name, None, opts)?; dm.device_create(verity_name, None, opts); @@ -281,7 +281,7 @@ pub fn create_verity_device( } - //dm.table_load(&id, verity_table.as_slice(), opts)?; + dm.table_load(&id, verity_table.as_slice(), opts)?; //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); From 898eea7b472c3c9af6d6f8f6b0b21562d0d56c0e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 20:34:22 +0000 Subject: [PATCH 044/176] tmp --- image-rs/src/verity/dmverity.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index ca5685127..f07cb0867 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -255,14 +255,13 @@ pub fn create_verity_device( )]; //dm.device_create(verity_name, None, opts)?; - dm.device_create(verity_name, None, opts); + dm.device_create(verity_name, None, opts)?; // if let Err(ref e) = result { // println!("CSG-M4GIC: (KS-image-rs) Error occurred while creating device: {}", e); // result.unwrap(); // } - println!("KS (image-rs) verity device created"); let cmd = "ls /"; From 60a63093e497a3c5748cc04e2b906c336589e214 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 21:45:41 +0000 Subject: [PATCH 045/176] tmp --- image-rs/src/verity/dmverity.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index f07cb0867..fa6c9c9d6 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -303,16 +303,17 @@ pub fn create_verity_device( } //////// - dm.device_suspend(&id, opts)?; + //dm.device_suspend(&id, opts)?; let result = dm.device_suspend(&id, opts); - match result { - Ok(device_info) => { - println!("KS (image-rs) Device suspended successfully. Device info: {:?}", device_info); - }, - Err(e) => { - println!("KS (image-rs) Error occurred while trying to suspend device: {:?}", e); - } - } + println!("KS (image-rs) Device suspended result {:?}", result); + // match result { + // Ok(device_info) => { + // println!("KS (image-rs) Device suspended successfully. Device info: {:?}", device_info); + // }, + // Err(e) => { + // println!("KS (image-rs) Error occurred while trying to suspend device: {:?}", e); + // } + // } println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); Ok(format!("/dev/mapper/{}", &verity_option.hash)) From 82b107186181152e79b9c0d393ff6baeb4c6ab59 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 22:02:18 +0000 Subject: [PATCH 046/176] tmp --- image-rs/src/verity/dmverity.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index fa6c9c9d6..d7fe22972 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -274,7 +274,7 @@ pub fn create_verity_device( if output.status.success() { let stdout = str::from_utf8(&output.stdout).unwrap(); println!("KS (image-rs) Command '{}' executed successfully.", cmd); - println!("KS (image-rs) 'ls' Output:\n{}", stdout); + println!("KS (image-rs) 'ls' Output: {}", stdout); } else { eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); } @@ -297,7 +297,7 @@ pub fn create_verity_device( if output.status.success() { let stdout = str::from_utf8(&output.stdout).unwrap(); println!("KS (image-rs) Command '{}' executed successfully.", cmd); - println!("KS (image-rs) 'ls' Output:\n{}", stdout); + println!("KS (image-rs) 'ls' Output: {}", stdout); } else { eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); } From 7fd9f5744c44db12fe2f2bc1d1f94ffff310c1b8 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 22:18:32 +0000 Subject: [PATCH 047/176] tmp --- image-rs/src/verity/dmverity.rs | 42 ++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index d7fe22972..9931ec6e8 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -272,13 +272,26 @@ pub fn create_verity_device( .expect("KS (image-rs) Failed to execute 'ls' command"); if output.status.success() { - let stdout = str::from_utf8(&output.stdout).unwrap(); - println!("KS (image-rs) Command '{}' executed successfully.", cmd); - println!("KS (image-rs) 'ls' Output: {}", stdout); + let stdout = str::from_utf8(&output.stdout) + .unwrap_or("KS Failed to decode stdout as UTF-8"); + + for line in stdout.split('\n') { + println!("KS Line: {}", line); + } } else { - eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); + let stderr = str::from_utf8(&output.stderr) + .unwrap_or("KS Failed to decode stderr as UTF-8"); + eprintln!("KS Failed to execute '{}': {}", cmd, stderr); } + // if output.status.success() { + // let stdout = str::from_utf8(&output.stdout).unwrap(); + // println!("KS (image-rs) Command '{}' executed successfully.", cmd); + // println!("KS (image-rs) 'ls' Output: {}", stdout); + // } else { + // eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); + // } + dm.table_load(&id, verity_table.as_slice(), opts)?; @@ -295,12 +308,25 @@ pub fn create_verity_device( .expect("KS (image-rs) Failed to execute 'ls' command"); if output.status.success() { - let stdout = str::from_utf8(&output.stdout).unwrap(); - println!("KS (image-rs) Command '{}' executed successfully.", cmd); - println!("KS (image-rs) 'ls' Output: {}", stdout); + let stdout = str::from_utf8(&output.stdout) + .unwrap_or("KS Failed to decode stdout as UTF-8"); + + for line in stdout.split('\n') { + println!("KS Line: {}", line); + } } else { - eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); + let stderr = str::from_utf8(&output.stderr) + .unwrap_or("KS Failed to decode stderr as UTF-8"); + eprintln!("KS Failed to execute '{}': {}", cmd, stderr); } + + // if output.status.success() { + // let stdout = str::from_utf8(&output.stdout).unwrap(); + // println!("KS (image-rs) Command '{}' executed successfully.", cmd); + // println!("KS (image-rs) 'ls' Output: {}", stdout); + // } else { + // eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); + // } //////// //dm.device_suspend(&id, opts)?; From a1790a68aad48a26a0eb56b75074f50e45f82def Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 22:31:11 +0000 Subject: [PATCH 048/176] tmp --- image-rs/src/verity/dmverity.rs | 39 ++++++++++----------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 9931ec6e8..cfd20e457 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -264,7 +264,14 @@ pub fn create_verity_device( println!("KS (image-rs) verity device created"); - let cmd = "ls /"; + dm.table_load(&id, verity_table.as_slice(), opts)?; + + //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); + + println!("KS (image-rs) verity table loaded"); + + //////// + let cmd = "ls /dev/mapper"; let output = Command::new("sh") .arg("-c") .arg(cmd) @@ -276,7 +283,7 @@ pub fn create_verity_device( .unwrap_or("KS Failed to decode stdout as UTF-8"); for line in stdout.split('\n') { - println!("KS Line: {}", line); + println!("KS mapper file: {}", line); } } else { let stderr = str::from_utf8(&output.stderr) @@ -284,23 +291,7 @@ pub fn create_verity_device( eprintln!("KS Failed to execute '{}': {}", cmd, stderr); } - // if output.status.success() { - // let stdout = str::from_utf8(&output.stdout).unwrap(); - // println!("KS (image-rs) Command '{}' executed successfully.", cmd); - // println!("KS (image-rs) 'ls' Output: {}", stdout); - // } else { - // eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); - // } - - - dm.table_load(&id, verity_table.as_slice(), opts)?; - - //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); - - println!("KS (image-rs) verity table loaded"); - - //////// - let cmd = "ls /dev/mapper"; + let cmd = "ls /dev/vda"; let output = Command::new("sh") .arg("-c") .arg(cmd) @@ -312,7 +303,7 @@ pub fn create_verity_device( .unwrap_or("KS Failed to decode stdout as UTF-8"); for line in stdout.split('\n') { - println!("KS Line: {}", line); + println!("KS vda file: {}", line); } } else { let stderr = str::from_utf8(&output.stderr) @@ -320,14 +311,6 @@ pub fn create_verity_device( eprintln!("KS Failed to execute '{}': {}", cmd, stderr); } - // if output.status.success() { - // let stdout = str::from_utf8(&output.stdout).unwrap(); - // println!("KS (image-rs) Command '{}' executed successfully.", cmd); - // println!("KS (image-rs) 'ls' Output: {}", stdout); - // } else { - // eprintln!("KS (image-rs) Failed to execute '{}': {}", cmd, str::from_utf8(&output.stderr).unwrap()); - // } - //////// //dm.device_suspend(&id, opts)?; let result = dm.device_suspend(&id, opts); From 338196d7f88ead2be1339aa89c07515adefbf803 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 3 May 2024 22:46:19 +0000 Subject: [PATCH 049/176] tmp --- image-rs/src/verity/dmverity.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index cfd20e457..1dae4ade0 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -291,7 +291,7 @@ pub fn create_verity_device( eprintln!("KS Failed to execute '{}': {}", cmd, stderr); } - let cmd = "ls /dev/vda"; + let cmd = "ls /dev/sda"; let output = Command::new("sh") .arg("-c") .arg(cmd) @@ -303,7 +303,7 @@ pub fn create_verity_device( .unwrap_or("KS Failed to decode stdout as UTF-8"); for line in stdout.split('\n') { - println!("KS vda file: {}", line); + println!("KS sda file: {}", line); } } else { let stderr = str::from_utf8(&output.stderr) From b1272f3ab9194866f5839343e1acfafbfc1eea8c Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 11:07:44 +0000 Subject: [PATCH 050/176] update --- image-rs/src/verity/dmverity.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 1dae4ade0..cc6cb4756 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -312,9 +312,9 @@ pub fn create_verity_device( } - //dm.device_suspend(&id, opts)?; - let result = dm.device_suspend(&id, opts); - println!("KS (image-rs) Device suspended result {:?}", result); + dm.device_suspend(&id, opts)?; + // let result = dm.device_suspend(&id, opts); + // println!("KS (image-rs) Device suspended result {:?}", result); // match result { // Ok(device_info) => { // println!("KS (image-rs) Device suspended successfully. Device info: {:?}", device_info); From ee7e3012ef64759cc41454bbf42f43f0829c5239 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 11:43:01 +0000 Subject: [PATCH 051/176] update --- image-rs/src/verity/dmverity.rs | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index cc6cb4756..f5061617b 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -255,7 +255,9 @@ pub fn create_verity_device( )]; //dm.device_create(verity_name, None, opts)?; - dm.device_create(verity_name, None, opts)?; + let dev = dm.device_create(verity_name, None, opts).unwrap(); + + println!("CSG-M4GIC: (KS-image-rs) Device created: {:?}", dev); // if let Err(ref e) = result { // println!("CSG-M4GIC: (KS-image-rs) Error occurred while creating device: {}", e); @@ -264,12 +266,18 @@ pub fn create_verity_device( println!("KS (image-rs) verity device created"); + dm.table_load(&id, verity_table.as_slice(), opts)?; //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); println!("KS (image-rs) verity table loaded"); + dev_info = dm.device_info(&id).unwrap(); + + println!("KS (image-rs) dev info collected: {:?}", dev_info); + + //////// let cmd = "ls /dev/mapper"; let output = Command::new("sh") @@ -291,28 +299,14 @@ pub fn create_verity_device( eprintln!("KS Failed to execute '{}': {}", cmd, stderr); } - let cmd = "ls /dev/sda"; - let output = Command::new("sh") - .arg("-c") - .arg(cmd) - .output() - .expect("KS (image-rs) Failed to execute 'ls' command"); - if output.status.success() { - let stdout = str::from_utf8(&output.stdout) - .unwrap_or("KS Failed to decode stdout as UTF-8"); + //dm.device_suspend(&id, opts)?; - for line in stdout.split('\n') { - println!("KS sda file: {}", line); - } - } else { - let stderr = str::from_utf8(&output.stderr) - .unwrap_or("KS Failed to decode stderr as UTF-8"); - eprintln!("KS Failed to execute '{}': {}", cmd, stderr); - } + dm.device_suspend(&id, DmOptions::default().set_flags(DmFlags::DM_SKIP_LOCKFS)).unwrap(); + + println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); - dm.device_suspend(&id, opts)?; // let result = dm.device_suspend(&id, opts); // println!("KS (image-rs) Device suspended result {:?}", result); // match result { @@ -323,7 +317,6 @@ pub fn create_verity_device( // println!("KS (image-rs) Error occurred while trying to suspend device: {:?}", e); // } // } - println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); Ok(format!("/dev/mapper/{}", &verity_option.hash)) } From 13d897af82fe15d00f3ab82ce87b5a43cf8a4649 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 11:44:05 +0000 Subject: [PATCH 052/176] dev info --- image-rs/src/verity/dmverity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index f5061617b..13c6b759e 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -273,7 +273,7 @@ pub fn create_verity_device( println!("KS (image-rs) verity table loaded"); - dev_info = dm.device_info(&id).unwrap(); + let dev_info = dm.device_info(&id).unwrap(); println!("KS (image-rs) dev info collected: {:?}", dev_info); From c05a3847f838f1346451134f8736cfc54e4021d2 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 13:42:04 +0000 Subject: [PATCH 053/176] dev info --- image-rs/src/verity/dmverity.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 13c6b759e..390065413 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -302,21 +302,21 @@ pub fn create_verity_device( //dm.device_suspend(&id, opts)?; - dm.device_suspend(&id, DmOptions::default().set_flags(DmFlags::DM_SKIP_LOCKFS)).unwrap(); + //dm.device_suspend(&id, DmOptions::default().set_flags(DmFlags::DM_SKIP_LOCKFS)).unwrap(); println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); - // let result = dm.device_suspend(&id, opts); - // println!("KS (image-rs) Device suspended result {:?}", result); - // match result { - // Ok(device_info) => { - // println!("KS (image-rs) Device suspended successfully. Device info: {:?}", device_info); - // }, - // Err(e) => { - // println!("KS (image-rs) Error occurred while trying to suspend device: {:?}", e); - // } - // } + let result = dm.device_suspend(&id, DmOptions::default().set_flags(DmFlags::DM_SKIP_LOCKFS)); + println!("KS (image-rs) Device suspended result {:?}", result); + match result { + Ok(device_info) => { + println!("KS (image-rs) Device suspended successfully. Device info: {:?}", device_info); + }, + Err(e) => { + println!("KS (image-rs) Error occurred while trying to suspend device: {:?}", e); + } + } println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); Ok(format!("/dev/mapper/{}", &verity_option.hash)) } From 91d823044771dd1e78c3ab8206c0606b7a603500 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 14:11:32 +0000 Subject: [PATCH 054/176] update devmapper --- image-rs/Cargo.toml | 3 ++- image-rs/src/verity/dmverity.rs | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 8fcca8c57..6e485663b 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -15,7 +15,8 @@ async-trait.workspace = true attestation_agent = { path = "../attestation-agent/lib", default-features = false, optional = true } base64.workspace = true cfg-if = { workspace = true, optional = true } -devicemapper = { version = "0.33.5", optional = true } +#devicemapper = { version = "0.33.5", optional = true } +devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="99e31f9", optional = true} dircpy = { version = "0.3.12", optional = true } flate2 = "1.0" fs_extra = { version = "1.2.0", optional = true } diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 390065413..2e46172b0 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -304,9 +304,6 @@ pub fn create_verity_device( //dm.device_suspend(&id, DmOptions::default().set_flags(DmFlags::DM_SKIP_LOCKFS)).unwrap(); - println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); - - let result = dm.device_suspend(&id, DmOptions::default().set_flags(DmFlags::DM_SKIP_LOCKFS)); println!("KS (image-rs) Device suspended result {:?}", result); match result { From 69ac33dcfc21ca569276d3241440d0650dadd4ef Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 14:15:34 +0000 Subject: [PATCH 055/176] update devmapper --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 6e485663b..765148274 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -16,7 +16,7 @@ attestation_agent = { path = "../attestation-agent/lib", default-features = fals base64.workspace = true cfg-if = { workspace = true, optional = true } #devicemapper = { version = "0.33.5", optional = true } -devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="99e31f9", optional = true} +devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", default-features = true, rev="99e31f9", optional = true} dircpy = { version = "0.3.12", optional = true } flate2 = "1.0" fs_extra = { version = "1.2.0", optional = true } From 8d3b16776049e4739cf11a4ad0f6a8ff7de33f43 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 14:37:54 +0000 Subject: [PATCH 056/176] update devmapper --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 765148274..95df129a1 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -16,7 +16,7 @@ attestation_agent = { path = "../attestation-agent/lib", default-features = fals base64.workspace = true cfg-if = { workspace = true, optional = true } #devicemapper = { version = "0.33.5", optional = true } -devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", default-features = true, rev="99e31f9", optional = true} +devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="5a92d1a", optional = true} dircpy = { version = "0.3.12", optional = true } flate2 = "1.0" fs_extra = { version = "1.2.0", optional = true } From d65e5ba41f62e72ff350a5fdb860a7e9f1beb40e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 14:51:46 +0000 Subject: [PATCH 057/176] update devmapper --- image-rs/Cargo.toml | 2 +- image-rs/src/verity/dmverity.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 95df129a1..b8b79146e 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -16,7 +16,7 @@ attestation_agent = { path = "../attestation-agent/lib", default-features = fals base64.workspace = true cfg-if = { workspace = true, optional = true } #devicemapper = { version = "0.33.5", optional = true } -devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="5a92d1a", optional = true} +devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="553851a", optional = true} dircpy = { version = "0.3.12", optional = true } flate2 = "1.0" fs_extra = { version = "1.2.0", optional = true } diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 2e46172b0..582bc3038 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -304,7 +304,7 @@ pub fn create_verity_device( //dm.device_suspend(&id, DmOptions::default().set_flags(DmFlags::DM_SKIP_LOCKFS)).unwrap(); - let result = dm.device_suspend(&id, DmOptions::default().set_flags(DmFlags::DM_SKIP_LOCKFS)); + let result = dm.device_suspend(&id, opts); println!("KS (image-rs) Device suspended result {:?}", result); match result { Ok(device_info) => { From c9e2da496855ab6128f8c2158f18c798cc696dc5 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 15:19:27 +0000 Subject: [PATCH 058/176] update devmapper --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index b8b79146e..4a955b076 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -16,7 +16,7 @@ attestation_agent = { path = "../attestation-agent/lib", default-features = fals base64.workspace = true cfg-if = { workspace = true, optional = true } #devicemapper = { version = "0.33.5", optional = true } -devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="553851a", optional = true} +devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="a3d6c1e", optional = true} dircpy = { version = "0.3.12", optional = true } flate2 = "1.0" fs_extra = { version = "1.2.0", optional = true } From 4582eff65543f8660c5aa432285b60ea35dfa116 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 15:38:05 +0000 Subject: [PATCH 059/176] update devmapper --- image-rs/src/verity/dmverity.rs | 42 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 582bc3038..86c84a30c 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -267,37 +267,35 @@ pub fn create_verity_device( println!("KS (image-rs) verity device created"); - dm.table_load(&id, verity_table.as_slice(), opts)?; + let dev_info = dm.table_load(&id, verity_table.as_slice(), opts)?; //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); println!("KS (image-rs) verity table loaded"); - let dev_info = dm.device_info(&id).unwrap(); - println!("KS (image-rs) dev info collected: {:?}", dev_info); //////// - let cmd = "ls /dev/mapper"; - let output = Command::new("sh") - .arg("-c") - .arg(cmd) - .output() - .expect("KS (image-rs) Failed to execute 'ls' command"); - - if output.status.success() { - let stdout = str::from_utf8(&output.stdout) - .unwrap_or("KS Failed to decode stdout as UTF-8"); - - for line in stdout.split('\n') { - println!("KS mapper file: {}", line); - } - } else { - let stderr = str::from_utf8(&output.stderr) - .unwrap_or("KS Failed to decode stderr as UTF-8"); - eprintln!("KS Failed to execute '{}': {}", cmd, stderr); - } + // let cmd = "ls /dev/mapper"; + // let output = Command::new("sh") + // .arg("-c") + // .arg(cmd) + // .output() + // .expect("KS (image-rs) Failed to execute 'ls' command"); + + // if output.status.success() { + // let stdout = str::from_utf8(&output.stdout) + // .unwrap_or("KS Failed to decode stdout as UTF-8"); + + // for line in stdout.split('\n') { + // println!("KS mapper file: {}", line); + // } + // } else { + // let stderr = str::from_utf8(&output.stderr) + // .unwrap_or("KS Failed to decode stderr as UTF-8"); + // eprintln!("KS Failed to execute '{}': {}", cmd, stderr); + // } //dm.device_suspend(&id, opts)?; From 3cebd513c138055af08fb22ba6f7f8a3386b582d Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 15:56:20 +0000 Subject: [PATCH 060/176] update devmapper --- image-rs/src/verity/dmverity.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 86c84a30c..59dc877ba 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -267,13 +267,13 @@ pub fn create_verity_device( println!("KS (image-rs) verity device created"); - let dev_info = dm.table_load(&id, verity_table.as_slice(), opts)?; + //let dev_info = dm.table_load(&id, verity_table.as_slice(), opts)?; //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); - println!("KS (image-rs) verity table loaded"); + //println!("KS (image-rs) verity table loaded"); - println!("KS (image-rs) dev info collected: {:?}", dev_info); + //println!("KS (image-rs) dev info collected: {:?}", dev_info); //////// From 7dbf92ce0a0a15bd9a06a5aa6c68497ae7d89644 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 15:57:11 +0000 Subject: [PATCH 061/176] update devmapper --- image-rs/src/verity/dmverity.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 59dc877ba..4c7d8cebf 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -247,12 +247,12 @@ pub fn create_verity_device( // is name of mapping target, here "verity" for dm-verity // are parameters for verity target - let verity_table = vec![( - 0, - verity_option.blocknum * verity_option.blocksize / 512, - "verity".into(), - verity_params, - )]; + //let verity_table = vec![( + // 0, + // verity_option.blocknum * verity_option.blocksize / 512, + // "verity".into(), + // verity_params, + //)]; //dm.device_create(verity_name, None, opts)?; let dev = dm.device_create(verity_name, None, opts).unwrap(); From 64a4395c684e6c5bc973a89078af9f39d850d61e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 4 May 2024 23:59:20 +0000 Subject: [PATCH 062/176] logs added --- image-rs/src/verity/dmverity.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 4c7d8cebf..11399febe 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -247,12 +247,12 @@ pub fn create_verity_device( // is name of mapping target, here "verity" for dm-verity // are parameters for verity target - //let verity_table = vec![( - // 0, - // verity_option.blocknum * verity_option.blocksize / 512, - // "verity".into(), - // verity_params, - //)]; + let verity_table = vec![( + 0, + verity_option.blocknum * verity_option.blocksize / 512, + "verity".into(), + verity_params, + )]; //dm.device_create(verity_name, None, opts)?; let dev = dm.device_create(verity_name, None, opts).unwrap(); @@ -267,9 +267,9 @@ pub fn create_verity_device( println!("KS (image-rs) verity device created"); - //let dev_info = dm.table_load(&id, verity_table.as_slice(), opts)?; + let dev_info = dm.table_load(&id, verity_table.as_slice(), opts)?; - //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); + println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); //println!("KS (image-rs) verity table loaded"); From a1ddfced76ea079313b5bcdbf0e70336319f5afd Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 5 May 2024 00:02:12 +0000 Subject: [PATCH 063/176] logs added --- image-rs/src/verity/dmverity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 11399febe..e3eaa6927 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -269,7 +269,7 @@ pub fn create_verity_device( let dev_info = dm.table_load(&id, verity_table.as_slice(), opts)?; - println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", device_info); + println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", dev_info); //println!("KS (image-rs) verity table loaded"); From 3162274d42c8800e9548c2970db9288a5d4cb3ed Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 5 May 2024 10:10:52 +0000 Subject: [PATCH 064/176] update devmapper --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 4a955b076..adc7404bd 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -16,7 +16,7 @@ attestation_agent = { path = "../attestation-agent/lib", default-features = fals base64.workspace = true cfg-if = { workspace = true, optional = true } #devicemapper = { version = "0.33.5", optional = true } -devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="a3d6c1e", optional = true} +devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="29d6dd5", optional = true} dircpy = { version = "0.3.12", optional = true } flate2 = "1.0" fs_extra = { version = "1.2.0", optional = true } From 507d174d11587a73d043949bba3ec26c63e9c97c Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 5 May 2024 14:25:06 +0000 Subject: [PATCH 065/176] list devices --- image-rs/src/verity/dmverity.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index e3eaa6927..53d882a30 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -275,6 +275,9 @@ pub fn create_verity_device( //println!("KS (image-rs) dev info collected: {:?}", dev_info); + let devs = dm.list_devices(); + + println!("CSG-M4GIC: KS (image-rs) listing devices: {:?}", devs); //////// // let cmd = "ls /dev/mapper"; From 776c70a198bea2b72466767f8f2d7966b47adf8b Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 5 May 2024 17:58:56 +0000 Subject: [PATCH 066/176] tmp --- image-rs/src/verity/dmverity.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 53d882a30..a40ac1422 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -202,6 +202,27 @@ pub fn create_verity_device( source_device_path: &Path, ) -> Result { println!("CSG-M4GIC: B3G1N: (KS-image-rs) create_verity_device, path: ({:?}), option: ({:?})", source_device_path, verity_option); + + let cmd = "ls /dev/mapper"; + let output = Command::new("sh") + .arg("-c") + .arg(cmd) + .output() + .expect("KS (image-rs) Failed to execute 'ls' command"); + + if output.status.success() { + let stdout = str::from_utf8(&output.stdout) + .unwrap_or("KS Failed to decode stdout as UTF-8"); + + for line in stdout.split('\n') { + println!("KS mapper file: {}", line); + } + } else { + let stderr = str::from_utf8(&output.stderr) + .unwrap_or("KS Failed to decode stderr as UTF-8"); + eprintln!("KS Failed to execute '{}': {}", cmd, stderr); + } + let dm = DM::new()?; let verity_name = DmName::new(&verity_option.hash)?; let id = DevId::Name(verity_name); From 3908329c9d51555ddcbd783c128f46039aec8dc2 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 5 May 2024 22:02:01 +0000 Subject: [PATCH 067/176] remove udev start --- image-rs/src/verity/dmverity.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index a40ac1422..485ad2dd7 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -261,7 +261,8 @@ pub fn create_verity_device( ); println!("CSG-M4GIC: (KS-image-rs) dm_verity params: ({:?})", verity_params); - start_udev(); + //start_udev(); + // Mapping table in device mapper: : // is 0 // is size of device in sectors, and one sector is equal to 512 bytes. From 61eb4501568a28dc86680c1e2bda615e44bee475 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 5 May 2024 22:06:15 +0000 Subject: [PATCH 068/176] remove udev start --- image-rs/src/verity/dmverity.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 485ad2dd7..541c164a3 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -262,7 +262,7 @@ pub fn create_verity_device( println!("CSG-M4GIC: (KS-image-rs) dm_verity params: ({:?})", verity_params); //start_udev(); - + // Mapping table in device mapper: : // is 0 // is size of device in sectors, and one sector is equal to 512 bytes. @@ -338,6 +338,9 @@ pub fn create_verity_device( } } println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); + + + start_udev(); Ok(format!("/dev/mapper/{}", &verity_option.hash)) } From fd175849c8f969120ed159628e405fcf97f2d754 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 5 May 2024 22:08:26 +0000 Subject: [PATCH 069/176] remove udev start --- image-rs/src/verity/dmverity.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 541c164a3..16a778dd5 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -341,6 +341,7 @@ pub fn create_verity_device( start_udev(); + Ok(format!("/dev/mapper/{}", &verity_option.hash)) } From 62b6c001b5a3012cbe27d82695da6f664e538baf Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 6 May 2024 10:18:24 +0000 Subject: [PATCH 070/176] star tudev --- image-rs/src/verity/dmverity.rs | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 16a778dd5..b6266252d 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -261,7 +261,7 @@ pub fn create_verity_device( ); println!("CSG-M4GIC: (KS-image-rs) dm_verity params: ({:?})", verity_params); - //start_udev(); + start_udev(); // Mapping table in device mapper: : // is 0 @@ -301,32 +301,8 @@ pub fn create_verity_device( println!("CSG-M4GIC: KS (image-rs) listing devices: {:?}", devs); - //////// - // let cmd = "ls /dev/mapper"; - // let output = Command::new("sh") - // .arg("-c") - // .arg(cmd) - // .output() - // .expect("KS (image-rs) Failed to execute 'ls' command"); - - // if output.status.success() { - // let stdout = str::from_utf8(&output.stdout) - // .unwrap_or("KS Failed to decode stdout as UTF-8"); - - // for line in stdout.split('\n') { - // println!("KS mapper file: {}", line); - // } - // } else { - // let stderr = str::from_utf8(&output.stderr) - // .unwrap_or("KS Failed to decode stderr as UTF-8"); - // eprintln!("KS Failed to execute '{}': {}", cmd, stderr); - // } - - //dm.device_suspend(&id, opts)?; - //dm.device_suspend(&id, DmOptions::default().set_flags(DmFlags::DM_SKIP_LOCKFS)).unwrap(); - let result = dm.device_suspend(&id, opts); println!("KS (image-rs) Device suspended result {:?}", result); match result { @@ -339,9 +315,6 @@ pub fn create_verity_device( } println!("CSG-M4GIC: END: (KS-image-rs) create_verity_device"); - - start_udev(); - Ok(format!("/dev/mapper/{}", &verity_option.hash)) } From a6cf4e0550652217ef1e921e3be4bf953c06672b Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 11 May 2024 12:39:26 +0000 Subject: [PATCH 071/176] fuse daemon logs --- image-rs/src/nydus/service.rs | 3 +-- image-rs/src/verity/dmverity.rs | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/image-rs/src/nydus/service.rs b/image-rs/src/nydus/service.rs index 54e960f22..eef0e7cdd 100644 --- a/image-rs/src/nydus/service.rs +++ b/image-rs/src/nydus/service.rs @@ -90,7 +90,6 @@ pub async fn start_nydus_service( } else { bootstrap_meta.compressed_digest.clone() }; - if let Err(e) = task::spawn_blocking(move || { process_fscache_daemon( id, @@ -169,7 +168,7 @@ pub fn process_fuse_daemon( reference.repository(), work_dir.join("cache"), ); - //println!("KS-image-rs: process_fuse_deamon called, with config ({:?}), bootstrap ({:?}), mountpoint ({:?}), workdir ({:?}) and fuse_config ({:?})", config, bootstrap, mountpoint, work_dir, fuse_config); + println!("KS-image-rs: process_fuse_deamon called, with reference: {:?}, config ({:?}), bootstrap ({:?}), mountpoint ({:?}), workdir ({:?}) and fuse_config ({:?})", reference, config, bootstrap, mountpoint, work_dir, fuse_config); if !mountpoint.exists() { std::fs::create_dir_all(mountpoint)?; diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index b6266252d..6eccaf7d3 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -288,7 +288,6 @@ pub fn create_verity_device( println!("KS (image-rs) verity device created"); - let dev_info = dm.table_load(&id, verity_table.as_slice(), opts)?; println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", dev_info); From 445ba1f579c14864fd8c5d18e02ba155073543be Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 12:16:10 +0000 Subject: [PATCH 072/176] update nydus-service --- image-rs/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index adc7404bd..84ddf1d02 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,7 +51,8 @@ walkdir = "2" zstd = "0.12" nydus-api = { version = "0.3.0", optional = true} -nydus-service = { version = "0.3.0", features = ["coco"], optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], optional = true} +#nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] anyhow.workspace = true From 89f250d2067373bc12ebc5ce9fe681252c0db2e1 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 14:44:10 +0000 Subject: [PATCH 073/176] patch cargo.toml --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 84ddf1d02..74c7734b9 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,7 +51,7 @@ walkdir = "2" zstd = "0.12" nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], optional = true, path = "service"} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 5c4e43fb36f5af4f1ef6bbbafdadefbc9f1d9f38 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 14:50:12 +0000 Subject: [PATCH 074/176] patch config --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 74c7734b9..dd8a70fc4 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,8 +51,8 @@ walkdir = "2" zstd = "0.12" nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], optional = true, path = "service"} -#nydus-service = { version = "0.3.0", features = ["coco"], optional = true} +#nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], optional = true, path = "service"} +nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] anyhow.workspace = true From c2292152c5e84e17b642c966ac896b6f79faa556 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 14:51:25 +0000 Subject: [PATCH 075/176] patch config --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index dd8a70fc4..84ddf1d02 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,8 +51,8 @@ walkdir = "2" zstd = "0.12" nydus-api = { version = "0.3.0", optional = true} -#nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], optional = true, path = "service"} -nydus-service = { version = "0.3.0", features = ["coco"], optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], optional = true} +#nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] anyhow.workspace = true From 88ac5f2b0967ae80cdd48527b2d663397e3ee278 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 14:53:33 +0000 Subject: [PATCH 076/176] patch config --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 84ddf1d02..e31ebf7f6 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,7 +51,7 @@ walkdir = "2" zstd = "0.12" nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From af0ba448959e60091c04235c11c4e774e490a843 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 14:55:59 +0000 Subject: [PATCH 077/176] patch config --- image-rs/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index e31ebf7f6..698160403 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -42,7 +42,8 @@ sha2.workspace = true sigstore = { git = "https://github.com/sigstore/sigstore-rs.git", rev = "69e8f33", default-features = false, optional = true} strum.workspace = true strum_macros = "0.25" -tar = "0.4.37" +#tar = "0.4.37" +tar = "0.4.40" tokio.workspace = true tonic = { workspace = true, optional = true } ttrpc = { workspace = true, features = [ "async" ], optional = true } From 6e0f73b3a89db7111f46117edbe9cadd6d2d4f53 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 16:09:19 +0000 Subject: [PATCH 078/176] nydus --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 698160403..dc93c6eff 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -18,7 +18,7 @@ cfg-if = { workspace = true, optional = true } #devicemapper = { version = "0.33.5", optional = true } devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="29d6dd5", optional = true} dircpy = { version = "0.3.12", optional = true } -flate2 = "1.0" +#flate2 = "1.0" fs_extra = { version = "1.2.0", optional = true } futures = { version = "0.3.28", optional = true } futures-util = "0.3" From 03e13bd2afeff663134f23eee143c756bdfa6209 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 16:12:13 +0000 Subject: [PATCH 079/176] nydus --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index dc93c6eff..c4f8d329e 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -18,7 +18,7 @@ cfg-if = { workspace = true, optional = true } #devicemapper = { version = "0.33.5", optional = true } devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="29d6dd5", optional = true} dircpy = { version = "0.3.12", optional = true } -#flate2 = "1.0" +flate2 = "1.0.28" fs_extra = { version = "1.2.0", optional = true } futures = { version = "0.3.28", optional = true } futures-util = "0.3" From 99f5437812d2bde9dd04a4df4bd46ff6dfcb8eef Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 16:58:08 +0000 Subject: [PATCH 080/176] deps --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index c4f8d329e..0dbcaecab 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -18,7 +18,7 @@ cfg-if = { workspace = true, optional = true } #devicemapper = { version = "0.33.5", optional = true } devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="29d6dd5", optional = true} dircpy = { version = "0.3.12", optional = true } -flate2 = "1.0.28" +flate2 = "1.0.25" fs_extra = { version = "1.2.0", optional = true } futures = { version = "0.3.28", optional = true } futures-util = "0.3" @@ -52,7 +52,7 @@ walkdir = "2" zstd = "0.12" nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93b3e3e", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="571c45c", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 3de34e5b2ba67557338e7b76767bdacf3c87dc39 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 17:34:52 +0000 Subject: [PATCH 081/176] deps --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 0dbcaecab..d122e18c9 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -52,7 +52,7 @@ walkdir = "2" zstd = "0.12" nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="571c45c", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="5418139", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From df786b436394c7f27f0d9a71f3ee7b09e7c68d8d Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 17:51:39 +0000 Subject: [PATCH 082/176] deps --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index d122e18c9..b50ef7e5a 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -52,7 +52,7 @@ walkdir = "2" zstd = "0.12" nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="5418139", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93ef71d", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 5b1ffc3ed222da4209da32457503cbc167d5c50e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 17:56:53 +0000 Subject: [PATCH 083/176] deps --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index b50ef7e5a..8321ceb92 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -52,7 +52,7 @@ walkdir = "2" zstd = "0.12" nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="93ef71d", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="42ebec2", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 06782f9b022909ab7903672e7f81108bce736541 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 19:33:37 +0000 Subject: [PATCH 084/176] deps --- image-rs/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 8321ceb92..bc80cc42d 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,7 +51,8 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { version = "0.3.0", optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="42ebec2", features = ["coco"], default-features = false, optional = true} +#nydus-api = { version = "0.3.0", optional = true} nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="42ebec2", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} From ad77611b38034b01ef361a5ecc9cb8de6fecfcb1 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 19:35:00 +0000 Subject: [PATCH 085/176] deps --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index bc80cc42d..db7b1bc67 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,7 +51,7 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="42ebec2", features = ["coco"], default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="42ebec2", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="42ebec2", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} From f944022df9f150a860a39393389787b6d8a8faf4 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 19:40:45 +0000 Subject: [PATCH 086/176] update nydsu-service --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index db7b1bc67..929430278 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="42ebec2", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="51397c8", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="42ebec2", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="51397c8", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 40d6c6f224e1958743e7df20932cf448f375afd5 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 22:39:43 +0000 Subject: [PATCH 087/176] deps --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 929430278..4ed76783e 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="51397c8", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="05fb46c", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="51397c8", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="05fb46c", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 4c9b4e80d2f8ae52b495f490565e111a6bda737d Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 12 May 2024 22:45:38 +0000 Subject: [PATCH 088/176] deps --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 4ed76783e..5f084b103 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="05fb46c", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="32837c1", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="05fb46c", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="32837c1", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From f9ceb00eeb052861bdd7edb2528b4cafe9529e3a Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 13 May 2024 14:00:10 +0000 Subject: [PATCH 089/176] logs --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 5f084b103..eb6344e31 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="32837c1", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="b32c328", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="32837c1", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="b32c328", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From b0a73937e50755f4ae1b56510612f3792cc910f0 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 13 May 2024 14:05:21 +0000 Subject: [PATCH 090/176] logs --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index eb6344e31..35e2df975 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="b32c328", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="48c554a", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="b32c328", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="48c554a", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 1d626ddb405f2e780694386df29479df3ebbc21a Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 13 May 2024 16:06:42 +0000 Subject: [PATCH 091/176] logs --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 35e2df975..d3e13a92f 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="48c554a", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="421b2a2", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="48c554a", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="421b2a2", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From e933b83176ff7d6504e13a5c3149ef284693b8db Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 13 May 2024 16:33:36 +0000 Subject: [PATCH 092/176] logs --- image-rs/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index d3e13a92f..50a09d09f 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -49,11 +49,11 @@ tonic = { workspace = true, optional = true } ttrpc = { workspace = true, features = [ "async" ], optional = true } url = "2.2.2" walkdir = "2" -zstd = "0.12" +zstd = "0.12"s -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="421b2a2", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="d17df63", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="421b2a2", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="d17df63", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 4c4449a7146438298c87cefca6341759b0f5482f Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 13 May 2024 16:52:19 +0000 Subject: [PATCH 093/176] logs --- image-rs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 50a09d09f..409ae77c5 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -49,7 +49,7 @@ tonic = { workspace = true, optional = true } ttrpc = { workspace = true, features = [ "async" ], optional = true } url = "2.2.2" walkdir = "2" -zstd = "0.12"s +zstd = "0.12" nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="d17df63", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} From 72945969a2cb21696fa590986c4182306a05bb77 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 14:27:34 +0000 Subject: [PATCH 094/176] dummy prefetch --- image-rs/src/verity/dmverity.rs | 57 +++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 6eccaf7d3..8ba13a0cb 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -11,6 +11,12 @@ use std::path::Path; use std::str; use std::process::Command; use nix::unistd::{access, AccessFlags}; +use reqwest::Client; +use std::fs::File; +use std::io::Write; +use tokio::runtime::Runtime; +use tokio::stream::StreamExt; + /// Configuration information for DmVerity device. #[derive(Debug, Deserialize, Serialize)] @@ -192,6 +198,55 @@ fn start_udev() { } } +async fn dummy_prefetch() -> Result<(), Box> { + let client = Client::new(); + let blob_ids = ["ac2c9c7c25e992c7a0f1b6261112df95281324d8229541317f763dfaf01c7f30", "c737fc16374b9e9a352300146ab49de56f0068e42618fe2ebe3323d4069b7b89"]; + let cache_dir = "/opt/nydus/cache/"; + + fs::create_dir_all(cache_dir)?; + + for &blob_id in &blob_ids { + let url = format!("https://external-registry.coco-csg.com/v2/tf-serving-tinybert/blobs/sha256:{}", blob_id); + let response = client.get(&url).send().await?; + + if response.status().is_success() { + let mut content = Vec::new(); + let mut content_stream = response.bytes_stream(); + while let Some(item) = content_stream.next().await { + content.extend(item?); + } + + let cache_path = format!("{}{}", cache_dir, blob_id); + let mut file = File::create(cache_path)?; + file.write_all(&content)?; + } else { + eprintln!("KS: Failed to fetch blob: {}", blob_id); + } + } + + let cmd = "ls /opt/nydus/cache/"; + let output = Command::new("sh") + .arg("-c") + .arg(cmd) + .output() + .expect("KS (image-rs) Failed to execute 'ls' command"); + + if output.status.success() { + let stdout = str::from_utf8(&output.stdout) + .unwrap_or("KS Failed to decode stdout as UTF-8"); + + for line in stdout.split('\n') { + println!("KS blob: {}", line); + } + } else { + let stderr = str::from_utf8(&output.stderr) + .unwrap_or("KS Failed to decode stderr as UTF-8"); + eprintln!("KS Failed to execute '{}': {}", cmd, stderr); + } + + Ok(()) +} + /// Creates a mapping with backed by data_device /// and using hash_device for in-kernel verification. @@ -263,6 +318,8 @@ pub fn create_verity_device( start_udev(); + dummy_prefetch(); + // Mapping table in device mapper: : // is 0 // is size of device in sectors, and one sector is equal to 512 bytes. From 070783db9a7516f506ad132afb7b673313e93db4 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 14:31:29 +0000 Subject: [PATCH 095/176] dummy prefetch --- image-rs/src/verity/dmverity.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 8ba13a0cb..65398f1d7 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -15,7 +15,9 @@ use reqwest::Client; use std::fs::File; use std::io::Write; use tokio::runtime::Runtime; -use tokio::stream::StreamExt; + +use std::fs; + /// Configuration information for DmVerity device. From 2be2e53a2ee75c182618e51e9022db5029b0bd9b Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 14:32:52 +0000 Subject: [PATCH 096/176] dummy prefetch --- image-rs/src/verity/dmverity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 65398f1d7..230e6b029 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -17,7 +17,7 @@ use std::io::Write; use tokio::runtime::Runtime; use std::fs; - +use futures_util::StreamExt; /// Configuration information for DmVerity device. From a7edc311817f7d75df6e5c12a22ad93582296357 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 14:37:22 +0000 Subject: [PATCH 097/176] dummy prefetch --- image-rs/src/image.rs | 61 +++++++++++++++++++++++++++++++++ image-rs/src/verity/dmverity.rs | 59 ------------------------------- 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index c7e1f5d76..fdc17c0ba 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -14,6 +14,14 @@ use std::convert::TryFrom; use std::path::Path; use std::sync::Arc; +use reqwest::Client; +use std::fs::File; +use std::io::Write; +use tokio::runtime::Runtime; + +use std::fs; +use futures_util::StreamExt; + use tokio::sync::Mutex; use crate::bundle::{create_runtime_config, BUNDLE_ROOTFS}; @@ -151,6 +159,56 @@ impl Default for ImageClient { } } +async fn dummy_prefetch() -> Result<(), Box> { + let client = Client::new(); + let blob_ids = ["ac2c9c7c25e992c7a0f1b6261112df95281324d8229541317f763dfaf01c7f30", "c737fc16374b9e9a352300146ab49de56f0068e42618fe2ebe3323d4069b7b89"]; + let cache_dir = "/opt/nydus/cache/"; + + fs::create_dir_all(cache_dir)?; + + for &blob_id in &blob_ids { + let url = format!("https://external-registry.coco-csg.com/v2/tf-serving-tinybert/blobs/sha256:{}", blob_id); + let response = client.get(&url).send().await?; + + if response.status().is_success() { + let mut content = Vec::new(); + let mut content_stream = response.bytes_stream(); + while let Some(item) = content_stream.next().await { + content.extend(item?); + } + + let cache_path = format!("{}{}", cache_dir, blob_id); + let mut file = File::create(cache_path)?; + file.write_all(&content)?; + } else { + eprintln!("KS: Failed to fetch blob: {}", blob_id); + } + } + + let cmd = "ls /opt/nydus/cache/"; + let output = Command::new("sh") + .arg("-c") + .arg(cmd) + .output() + .expect("KS (image-rs) Failed to execute 'ls' command"); + + if output.status.success() { + let stdout = str::from_utf8(&output.stdout) + .unwrap_or("KS Failed to decode stdout as UTF-8"); + + for line in stdout.split('\n') { + println!("KS blob: {}", line); + } + } else { + let stderr = str::from_utf8(&output.stderr) + .unwrap_or("KS Failed to decode stderr as UTF-8"); + eprintln!("KS Failed to execute '{}': {}", cmd, stderr); + } + + Ok(()) +} + + impl ImageClient { /// pull_image pulls an image with optional auth info and decrypt config /// and store the pulled data under user defined work_dir/layers. @@ -466,6 +524,9 @@ impl ImageClient { .insert(image_data.id.clone(), image_data.clone()); //println!("CSG-M4GIC: END: (KS-image-rs) Handle Bootstrap"); + + dummy_prefetch(); + Ok(image_id) } } diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 230e6b029..255cc4ac6 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -11,13 +11,6 @@ use std::path::Path; use std::str; use std::process::Command; use nix::unistd::{access, AccessFlags}; -use reqwest::Client; -use std::fs::File; -use std::io::Write; -use tokio::runtime::Runtime; - -use std::fs; -use futures_util::StreamExt; /// Configuration information for DmVerity device. @@ -200,56 +193,6 @@ fn start_udev() { } } -async fn dummy_prefetch() -> Result<(), Box> { - let client = Client::new(); - let blob_ids = ["ac2c9c7c25e992c7a0f1b6261112df95281324d8229541317f763dfaf01c7f30", "c737fc16374b9e9a352300146ab49de56f0068e42618fe2ebe3323d4069b7b89"]; - let cache_dir = "/opt/nydus/cache/"; - - fs::create_dir_all(cache_dir)?; - - for &blob_id in &blob_ids { - let url = format!("https://external-registry.coco-csg.com/v2/tf-serving-tinybert/blobs/sha256:{}", blob_id); - let response = client.get(&url).send().await?; - - if response.status().is_success() { - let mut content = Vec::new(); - let mut content_stream = response.bytes_stream(); - while let Some(item) = content_stream.next().await { - content.extend(item?); - } - - let cache_path = format!("{}{}", cache_dir, blob_id); - let mut file = File::create(cache_path)?; - file.write_all(&content)?; - } else { - eprintln!("KS: Failed to fetch blob: {}", blob_id); - } - } - - let cmd = "ls /opt/nydus/cache/"; - let output = Command::new("sh") - .arg("-c") - .arg(cmd) - .output() - .expect("KS (image-rs) Failed to execute 'ls' command"); - - if output.status.success() { - let stdout = str::from_utf8(&output.stdout) - .unwrap_or("KS Failed to decode stdout as UTF-8"); - - for line in stdout.split('\n') { - println!("KS blob: {}", line); - } - } else { - let stderr = str::from_utf8(&output.stderr) - .unwrap_or("KS Failed to decode stderr as UTF-8"); - eprintln!("KS Failed to execute '{}': {}", cmd, stderr); - } - - Ok(()) -} - - /// Creates a mapping with backed by data_device /// and using hash_device for in-kernel verification. /// It will return the verity block device Path "/dev/mapper/" @@ -320,8 +263,6 @@ pub fn create_verity_device( start_udev(); - dummy_prefetch(); - // Mapping table in device mapper: : // is 0 // is size of device in sectors, and one sector is equal to 512 bytes. From c348bc64c111314197087f5690ea305c013a96ee Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 14:38:32 +0000 Subject: [PATCH 098/176] dummy prefetch --- image-rs/src/image.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index fdc17c0ba..f3535e45e 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -14,6 +14,9 @@ use std::convert::TryFrom; use std::path::Path; use std::sync::Arc; +use std::str; +use std::process::Command; +use nix::unistd::{access, AccessFlags}; use reqwest::Client; use std::fs::File; use std::io::Write; From 70f7fbde8083e4b95c7e7ccb99793c663109fb0f Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 15:18:53 +0000 Subject: [PATCH 099/176] prefetch --- image-rs/src/image.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index f3535e45e..8364f5a33 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -166,10 +166,11 @@ async fn dummy_prefetch() -> Result<(), Box> { let client = Client::new(); let blob_ids = ["ac2c9c7c25e992c7a0f1b6261112df95281324d8229541317f763dfaf01c7f30", "c737fc16374b9e9a352300146ab49de56f0068e42618fe2ebe3323d4069b7b89"]; let cache_dir = "/opt/nydus/cache/"; - + println!("KS: dummy pre-fetch"); fs::create_dir_all(cache_dir)?; for &blob_id in &blob_ids { + println!("KS: pre fetching blob_id: {}", blob_id); let url = format!("https://external-registry.coco-csg.com/v2/tf-serving-tinybert/blobs/sha256:{}", blob_id); let response = client.get(&url).send().await?; From e051fa7a201f63a4f838e007dc818621bff62c80 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 15:32:10 +0000 Subject: [PATCH 100/176] prefetch --- image-rs/src/image.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 8364f5a33..011d29f41 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -529,7 +529,8 @@ impl ImageClient { //println!("CSG-M4GIC: END: (KS-image-rs) Handle Bootstrap"); - dummy_prefetch(); + let rt = Runtime::new().unwrap(); + rt.block_on(dummy_prefetch()).unwrap(); Ok(image_id) } From e8d976aaf428b9a326337ac27488618ae5c69dc8 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 15:43:58 +0000 Subject: [PATCH 101/176] prefetch --- image-rs/src/image.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 011d29f41..88f22a16a 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -162,7 +162,8 @@ impl Default for ImageClient { } } -async fn dummy_prefetch() -> Result<(), Box> { + +fn dummy_prefetch() -> Result<(), Box> { let client = Client::new(); let blob_ids = ["ac2c9c7c25e992c7a0f1b6261112df95281324d8229541317f763dfaf01c7f30", "c737fc16374b9e9a352300146ab49de56f0068e42618fe2ebe3323d4069b7b89"]; let cache_dir = "/opt/nydus/cache/"; @@ -172,20 +173,16 @@ async fn dummy_prefetch() -> Result<(), Box> { for &blob_id in &blob_ids { println!("KS: pre fetching blob_id: {}", blob_id); let url = format!("https://external-registry.coco-csg.com/v2/tf-serving-tinybert/blobs/sha256:{}", blob_id); - let response = client.get(&url).send().await?; + let response = client.get(&url).send()?; if response.status().is_success() { - let mut content = Vec::new(); - let mut content_stream = response.bytes_stream(); - while let Some(item) = content_stream.next().await { - content.extend(item?); - } + let content = response.bytes()?; let cache_path = format!("{}{}", cache_dir, blob_id); let mut file = File::create(cache_path)?; file.write_all(&content)?; } else { - eprintln!("KS: Failed to fetch blob: {}", blob_id); + eprintln!("Failed to fetch blob: {}", blob_id); } } @@ -529,8 +526,7 @@ impl ImageClient { //println!("CSG-M4GIC: END: (KS-image-rs) Handle Bootstrap"); - let rt = Runtime::new().unwrap(); - rt.block_on(dummy_prefetch()).unwrap(); + dummy_prefetch()?; Ok(image_id) } From 45223fac90d7c841f3faab5d8cdf2c04e2205130 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 15:46:17 +0000 Subject: [PATCH 102/176] prefetch --- image-rs/src/image.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 88f22a16a..c03bd6292 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -17,12 +17,12 @@ use std::sync::Arc; use std::str; use std::process::Command; use nix::unistd::{access, AccessFlags}; -use reqwest::Client; -use std::fs::File; use std::io::Write; use tokio::runtime::Runtime; -use std::fs; +use reqwest::blocking::Client; +use std::fs::{self, File}; + use futures_util::StreamExt; use tokio::sync::Mutex; From 8271456b2e2d22baadd5d09c8cb391b367d2d803 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 15:48:14 +0000 Subject: [PATCH 103/176] prefetch --- image-rs/src/image.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index c03bd6292..ab7a1d011 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -163,7 +163,7 @@ impl Default for ImageClient { } -fn dummy_prefetch() -> Result<(), Box> { +fn dummy_prefetch() -> Result<(), Box> { let client = Client::new(); let blob_ids = ["ac2c9c7c25e992c7a0f1b6261112df95281324d8229541317f763dfaf01c7f30", "c737fc16374b9e9a352300146ab49de56f0068e42618fe2ebe3323d4069b7b89"]; let cache_dir = "/opt/nydus/cache/"; From 77a1f4619461554bba0af0d88606903c103b2529 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 16:50:14 +0000 Subject: [PATCH 104/176] prefetch --- image-rs/src/image.rs | 48 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index ab7a1d011..550ca5928 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -11,19 +11,15 @@ use oci_spec::image::{ImageConfiguration, Os}; use serde::Deserialize; use std::collections::{BTreeSet, HashMap}; use std::convert::TryFrom; -use std::path::Path; use std::sync::Arc; -use std::str; -use std::process::Command; -use nix::unistd::{access, AccessFlags}; +use tokio::task; +use std::path::Path; +use std::fs::{self, File}; use std::io::Write; -use tokio::runtime::Runtime; - +use std::process::Command; +use std::str; use reqwest::blocking::Client; -use std::fs::{self, File}; - -use futures_util::StreamExt; use tokio::sync::Mutex; @@ -162,8 +158,7 @@ impl Default for ImageClient { } } - -fn dummy_prefetch() -> Result<(), Box> { +fn dummy_prefetch() -> Result<(), Box> { let client = Client::new(); let blob_ids = ["ac2c9c7c25e992c7a0f1b6261112df95281324d8229541317f763dfaf01c7f30", "c737fc16374b9e9a352300146ab49de56f0068e42618fe2ebe3323d4069b7b89"]; let cache_dir = "/opt/nydus/cache/"; @@ -182,28 +177,29 @@ fn dummy_prefetch() -> Result<(), Box> { let mut file = File::create(cache_path)?; file.write_all(&content)?; } else { - eprintln!("Failed to fetch blob: {}", blob_id); + eprintln!("KS Failed to fetch blob: {}", blob_id); } } let cmd = "ls /opt/nydus/cache/"; let output = Command::new("sh") - .arg("-c") - .arg(cmd) - .output() - .expect("KS (image-rs) Failed to execute 'ls' command"); + .arg("-c") + .arg(cmd) + .output() + .expect("Failed to execute 'ls' command"); if output.status.success() { let stdout = str::from_utf8(&output.stdout) - .unwrap_or("KS Failed to decode stdout as UTF-8"); - + .unwrap_or("Failed to decode stdout as UTF-8"); for line in stdout.split('\n') { - println!("KS blob: {}", line); + if !line.is_empty() { + println!("Blob: {}", line); + } } } else { let stderr = str::from_utf8(&output.stderr) - .unwrap_or("KS Failed to decode stderr as UTF-8"); - eprintln!("KS Failed to execute '{}': {}", cmd, stderr); + .unwrap_or("Failed to decode stderr as UTF-8"); + eprintln!("Failed to execute '{}': {}", cmd, stderr); } Ok(()) @@ -230,6 +226,12 @@ impl ImageClient { auth_info: &Option<&str>, decrypt_config: &Option<&str>, ) -> Result { + + task::spawn_blocking(|| { + if let Err(e) = dummy_prefetch() { + eprintln!("Error occurred: {}", e); + } + }).await?; //println!("KS-image-rs: pull_image called"); let reference = Reference::try_from(image_url)?; @@ -437,8 +439,6 @@ impl ImageClient { .image_db .insert(image_data.id.clone(), image_data.clone()); - - let meta_store_lock = self.meta_store.lock().await; // for (key, value) in meta_store_lock.image_db.iter() { // println!("KS-image-rs image_db entry: {} => {:?}", key, value); @@ -526,8 +526,6 @@ impl ImageClient { //println!("CSG-M4GIC: END: (KS-image-rs) Handle Bootstrap"); - dummy_prefetch()?; - Ok(image_id) } } From 5bd9e074b739bb2f507763a9ed358ca968f83126 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 17:11:52 +0000 Subject: [PATCH 105/176] prefetch --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 409ae77c5..3666202c3 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="d17df63", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="a2c9b30", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="d17df63", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="a2c9b30", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From a56c82bd3a25fe912a5e9627c3e431811e97abc7 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 17:16:20 +0000 Subject: [PATCH 106/176] prefetch --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 3666202c3..8c73c494a 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="a2c9b30", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="77e22e1", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="a2c9b30", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="77e22e1", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From f8d7a82656a18f6e49d5bb2cdfd2f150b3984c6d Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 14 May 2024 17:26:47 +0000 Subject: [PATCH 107/176] prefetch --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 8c73c494a..f10106bc9 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="77e22e1", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="f21c169", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="77e22e1", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="f21c169", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From a5be00f3489419fd903a766b43f46eaa343d9f41 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 18 May 2024 19:32:06 +0000 Subject: [PATCH 108/176] image url log --- image-rs/src/image.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 550ca5928..e3d8556b8 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -227,12 +227,12 @@ impl ImageClient { decrypt_config: &Option<&str>, ) -> Result { - task::spawn_blocking(|| { - if let Err(e) = dummy_prefetch() { - eprintln!("Error occurred: {}", e); - } - }).await?; - //println!("KS-image-rs: pull_image called"); + // task::spawn_blocking(|| { + // if let Err(e) = dummy_prefetch() { + // eprintln!("Error occurred: {}", e); + // } + // }).await?; + println!("KS-image-rs: pull_image called with image_url {:?}", image_url); let reference = Reference::try_from(image_url)?; // Try to get auth using input param. From 5397f4b7dcd6c6fa584517523045ff87c8f5ffb4 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 18 May 2024 20:29:33 +0000 Subject: [PATCH 109/176] update nydus --- image-rs/Cargo.toml | 4 ++-- image-rs/src/image.rs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index f10106bc9..ce8c72a46 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="f21c169", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="8e9b358", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="f21c169", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="8e9b358", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index e3d8556b8..5760722b3 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -233,7 +233,8 @@ impl ImageClient { // } // }).await?; println!("KS-image-rs: pull_image called with image_url {:?}", image_url); - let reference = Reference::try_from(image_url)?; + //let reference = Reference::try_from(image_url)?; + let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted")?; // Try to get auth using input param. let auth = if let Some(auth_info) = auth_info { From 5e8ffb85dde970165c0cef17f15e06a763a9e5ac Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 18 May 2024 20:35:18 +0000 Subject: [PATCH 110/176] fix --- image-rs/src/image.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 5760722b3..c4218763c 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -234,7 +234,7 @@ impl ImageClient { // }).await?; println!("KS-image-rs: pull_image called with image_url {:?}", image_url); //let reference = Reference::try_from(image_url)?; - let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted")?; + let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus")?; // Try to get auth using input param. let auth = if let Some(auth_info) = auth_info { From 025801fa1b221995ae335af5ffe67ffba738526e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 19 May 2024 01:07:34 +0000 Subject: [PATCH 111/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index ce8c72a46..4636e9805 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="8e9b358", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="35a24de", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="8e9b358", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="35a24de", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 4eb3d4c2a7f1ca6795b1612751c4fef1610b2c12 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 19 May 2024 01:49:34 +0000 Subject: [PATCH 112/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 4636e9805..2a67d3104 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="35a24de", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="862ee2e", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="35a24de", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="862ee2e", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 4fb3f89f2f17dff9e0e26575ce805735abdb9680 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 13:23:18 +0000 Subject: [PATCH 113/176] fix --- image-rs/src/image.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index c4218763c..3b2b28c4b 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -233,8 +233,8 @@ impl ImageClient { // } // }).await?; println!("KS-image-rs: pull_image called with image_url {:?}", image_url); - //let reference = Reference::try_from(image_url)?; - let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus")?; + let reference = Reference::try_from(image_url)?; + //let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus")?; // Try to get auth using input param. let auth = if let Some(auth_info) = auth_info { From 542d274067a739423504fbb987b6f1c1fa576f23 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 13:46:47 +0000 Subject: [PATCH 114/176] fix --- image-rs/src/image.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 3b2b28c4b..c4218763c 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -233,8 +233,8 @@ impl ImageClient { // } // }).await?; println!("KS-image-rs: pull_image called with image_url {:?}", image_url); - let reference = Reference::try_from(image_url)?; - //let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus")?; + //let reference = Reference::try_from(image_url)?; + let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus")?; // Try to get auth using input param. let auth = if let Some(auth_info) = auth_info { From 9b0b2a0c8d3e74c826bf37c5d84e2df144a5ca33 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 14:13:07 +0000 Subject: [PATCH 115/176] fix --- image-rs/Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 2a67d3104..d87b0f30a 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -15,8 +15,8 @@ async-trait.workspace = true attestation_agent = { path = "../attestation-agent/lib", default-features = false, optional = true } base64.workspace = true cfg-if = { workspace = true, optional = true } -#devicemapper = { version = "0.33.5", optional = true } -devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="29d6dd5", optional = true} +devicemapper = { version = "0.33.5", optional = true } +#devicemapper = { git="https://github.com/konsougiou/devicemapper-rs", rev="29d6dd5", optional = true} dircpy = { version = "0.3.12", optional = true } flate2 = "1.0.25" fs_extra = { version = "1.2.0", optional = true } @@ -51,10 +51,10 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="862ee2e", default-features = false, optional = true} -#nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="862ee2e", features = ["coco"], default-features = false, optional = true} -#nydus-service = { version = "0.3.0", features = ["coco"], optional = true} +#nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="862ee2e", default-features = false, optional = true} +nydus-api = { version = "0.3.0", optional = true} +#nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="862ee2e", features = ["coco"], default-features = false, optional = true} +nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] anyhow.workspace = true From 9f0f85664cde41f9a8c4872ffe52e2413ff58fdb Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 14:31:53 +0000 Subject: [PATCH 116/176] fix --- image-rs/src/image.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index c4218763c..8f8f4e9eb 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -231,10 +231,14 @@ impl ImageClient { // if let Err(e) = dummy_prefetch() { // eprintln!("Error occurred: {}", e); // } - // }).await?; + // }).await?; + + image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus"; println!("KS-image-rs: pull_image called with image_url {:?}", image_url); - //let reference = Reference::try_from(image_url)?; - let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus")?; + + + let reference = Reference::try_from(image_url)?; + //let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus")?; // Try to get auth using input param. let auth = if let Some(auth_info) = auth_info { From 8288ec1aa9fd459e01a644f31d88aac5882aaba8 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 14:33:20 +0000 Subject: [PATCH 117/176] fix --- image-rs/src/image.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 8f8f4e9eb..b72a77b34 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -233,7 +233,7 @@ impl ImageClient { // } // }).await?; - image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus"; + let image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus"; println!("KS-image-rs: pull_image called with image_url {:?}", image_url); From 080edd9f4175de554d5fab6833af187d9bb485f7 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 15:14:11 +0000 Subject: [PATCH 118/176] update nydus --- image-rs/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index d87b0f30a..45df29520 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,10 +51,10 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -#nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="862ee2e", default-features = false, optional = true} -nydus-api = { version = "0.3.0", optional = true} -#nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="862ee2e", features = ["coco"], default-features = false, optional = true} -nydus-service = { version = "0.3.0", features = ["coco"], optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="0f857a5", default-features = false, optional = true} +#nydus-api = { version = "0.3.0", optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="0f857a5", features = ["coco"], default-features = false, optional = true} +#nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] anyhow.workspace = true From 8f5d29eb025dcf72a5d3298ddf44a0911fc43676 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 15:28:48 +0000 Subject: [PATCH 119/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 45df29520..de8486022 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="0f857a5", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="13c7f3d", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="0f857a5", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="13c7f3d", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 3c34ccbb8fee492d499fa3b5f1cdb050ee25d96d Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 19:34:23 +0000 Subject: [PATCH 120/176] fix --- image-rs/src/image.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index b72a77b34..1c4f88bb7 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -233,7 +233,7 @@ impl ImageClient { // } // }).await?; - let image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus"; + let image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted"; println!("KS-image-rs: pull_image called with image_url {:?}", image_url); From c43a0558e3090f6dcea7846f9be90f136ed7b322 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 19:43:14 +0000 Subject: [PATCH 121/176] fix --- image-rs/src/image.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 1c4f88bb7..b72a77b34 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -233,7 +233,7 @@ impl ImageClient { // } // }).await?; - let image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted"; + let image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus"; println!("KS-image-rs: pull_image called with image_url {:?}", image_url); From df6f13229d6b09f68d85d5454ecff109ad8a41f8 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 21:30:07 +0000 Subject: [PATCH 122/176] less logs --- image-rs/Cargo.toml | 4 ++-- image-rs/src/image.rs | 2 +- image-rs/src/nydus/service.rs | 2 +- image-rs/src/verity/dmverity.rs | 16 +++++++--------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index de8486022..640e276e8 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="13c7f3d", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="8607166", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="13c7f3d", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="8607166", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index b72a77b34..2c18a5ee5 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -234,7 +234,7 @@ impl ImageClient { // }).await?; let image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus"; - println!("KS-image-rs: pull_image called with image_url {:?}", image_url); + //println!("KS-image-rs: pull_image called with image_url {:?}", image_url); let reference = Reference::try_from(image_url)?; diff --git a/image-rs/src/nydus/service.rs b/image-rs/src/nydus/service.rs index eef0e7cdd..bc277ca3f 100644 --- a/image-rs/src/nydus/service.rs +++ b/image-rs/src/nydus/service.rs @@ -168,7 +168,7 @@ pub fn process_fuse_daemon( reference.repository(), work_dir.join("cache"), ); - println!("KS-image-rs: process_fuse_deamon called, with reference: {:?}, config ({:?}), bootstrap ({:?}), mountpoint ({:?}), workdir ({:?}) and fuse_config ({:?})", reference, config, bootstrap, mountpoint, work_dir, fuse_config); + //println!("KS-image-rs: process_fuse_deamon called, with reference: {:?}, config ({:?}), bootstrap ({:?}), mountpoint ({:?}), workdir ({:?}) and fuse_config ({:?})", reference, config, bootstrap, mountpoint, work_dir, fuse_config); if !mountpoint.exists() { std::fs::create_dir_all(mountpoint)?; diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 255cc4ac6..27ad705e7 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -149,10 +149,10 @@ fn start_udev() { if check_udev.status.success() { println!("KS (image-rs) udev daemon is already running."); - println!("KS (image-rs) pgrep output: {}", str::from_utf8(&check_udev.stdout).unwrap()); + //println!("KS (image-rs) pgrep output: {}", str::from_utf8(&check_udev.stdout).unwrap()); } else { println!("KS (image-rs) udev daemon is not running."); - println!("KS (image-rs) pgrep stderr: {}", str::from_utf8(&check_udev.stderr).unwrap()); + //println!("KS (image-rs) pgrep stderr: {}", str::from_utf8(&check_udev.stderr).unwrap()); println!("KS (image-rs) Attempting to start udev..."); let cmds = [ @@ -180,10 +180,10 @@ fn start_udev() { if check_udev.status.success() { println!("KS (image-rs) udev daemon sucesfully started."); - println!("KS (image-rs) pgrep output: {}", str::from_utf8(&check_udev.stdout).unwrap()); + //println!("KS (image-rs) pgrep output: {}", str::from_utf8(&check_udev.stdout).unwrap()); } else { println!("KS (image-rs) udev daemon not started."); - println!("KS (image-rs) pgrep stderr: {}", str::from_utf8(&check_udev.stderr).unwrap()); + //println!("KS (image-rs) pgrep stderr: {}", str::from_utf8(&check_udev.stderr).unwrap()); } } if udev_running() { @@ -259,7 +259,7 @@ pub fn create_verity_device( verity_option.hash, "-", ); - println!("CSG-M4GIC: (KS-image-rs) dm_verity params: ({:?})", verity_params); + //println!("CSG-M4GIC: (KS-image-rs) dm_verity params: ({:?})", verity_params); start_udev(); @@ -286,11 +286,9 @@ pub fn create_verity_device( // result.unwrap(); // } - println!("KS (image-rs) verity device created"); - let dev_info = dm.table_load(&id, verity_table.as_slice(), opts)?; - println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", dev_info); + //println!("CSG-M4GIC: KS (image-rs) Loaded table with dev info: {:?}", dev_info); //println!("KS (image-rs) verity table loaded"); @@ -298,7 +296,7 @@ pub fn create_verity_device( let devs = dm.list_devices(); - println!("CSG-M4GIC: KS (image-rs) listing devices: {:?}", devs); + //println!("CSG-M4GIC: KS (image-rs) listing devices: {:?}", devs); //dm.device_suspend(&id, opts)?; From a281140b44ec6a608a8f6cec2a4493d44b48c280 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Mon, 20 May 2024 22:18:28 +0000 Subject: [PATCH 123/176] less logs --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 640e276e8..0a0a52581 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="8607166", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="59f28e4", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="8607166", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="59f28e4", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 08282030eecaba0469e61f49bdb915a9d3fd551c Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 21 May 2024 14:11:42 +0000 Subject: [PATCH 124/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 0a0a52581..9a5d5b4e5 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="59f28e4", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="cb0ef94", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="59f28e4", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="cb0ef94", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 70206297ba246dd7174c52dfbab184dcdaf21084 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 21 May 2024 14:20:55 +0000 Subject: [PATCH 125/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 9a5d5b4e5..661a15b16 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="cb0ef94", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="6007abc", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="cb0ef94", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="6007abc", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From f26cfeb497b122839b1aa72cfb3f093d1ed8e682 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 21 May 2024 14:35:59 +0000 Subject: [PATCH 126/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 661a15b16..2529bd632 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="6007abc", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="94c57cf", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="6007abc", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="94c57cf", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 8f1ca79865136ece46006c024e05cc6d76820785 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 21 May 2024 14:52:11 +0000 Subject: [PATCH 127/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 2529bd632..6a1bbc928 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="94c57cf", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="4ad7f3b", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="94c57cf", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="4ad7f3b", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 97d448f953f0b382f7c615f74ac1a3f4c40cdbcf Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 21 May 2024 16:38:04 +0000 Subject: [PATCH 128/176] adjust image_url --- image-rs/src/image.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 2c18a5ee5..4d10c9557 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -233,9 +233,10 @@ impl ImageClient { // } // }).await?; - let image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus"; + //let image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus"; //println!("KS-image-rs: pull_image called with image_url {:?}", image_url); - + let image_url = image_url.replace("blob-cache", "unencrypted-nydus"); + println!("KS-image-rs: adjusted image_url {:?}", image_url); let reference = Reference::try_from(image_url)?; //let reference = Reference::try_from("external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus")?; From 65a7defc6d5d76570d2a233b5ac17b914290b35d Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 21 May 2024 16:41:33 +0000 Subject: [PATCH 129/176] adjust image_url --- image-rs/src/image.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs index 4d10c9557..13e33e3f0 100644 --- a/image-rs/src/image.rs +++ b/image-rs/src/image.rs @@ -235,7 +235,7 @@ impl ImageClient { //let image_url = "external-registry.coco-csg.com/tf-serving-tinybert:unencrypted-nydus"; //println!("KS-image-rs: pull_image called with image_url {:?}", image_url); - let image_url = image_url.replace("blob-cache", "unencrypted-nydus"); + let image_url: &str = &image_url.replace("blob-cache", "unencrypted-nydus"); println!("KS-image-rs: adjusted image_url {:?}", image_url); let reference = Reference::try_from(image_url)?; From 38425978632f6bda68c70acc146afd63158ed391 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 21 May 2024 16:57:50 +0000 Subject: [PATCH 130/176] logs --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 6a1bbc928..b47b0a0ea 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="4ad7f3b", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="2a54797", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="4ad7f3b", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="2a54797", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 503c9c4323282a5950fa3ae31ac6d0c1aff84582 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Tue, 21 May 2024 17:34:32 +0000 Subject: [PATCH 131/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index b47b0a0ea..134e30f31 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="2a54797", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="eb84a8d", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="2a54797", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="eb84a8d", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 4a6eb0168047e5f9ac4d11d5ed433f3323028996 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Thu, 23 May 2024 11:24:25 +0000 Subject: [PATCH 132/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 134e30f31..7568514b2 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="eb84a8d", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="86e85a6", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="eb84a8d", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="86e85a6", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 9f9baa47a688dcc5826779493bd8b1a098fda17a Mon Sep 17 00:00:00 2001 From: konsougiou Date: Thu, 23 May 2024 11:26:19 +0000 Subject: [PATCH 133/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 7568514b2..654995634 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="86e85a6", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="256e047", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="86e85a6", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="256e047", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From fb8d4527562f53d290dda983549cebb94ea77049 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Thu, 23 May 2024 13:34:55 +0000 Subject: [PATCH 134/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 654995634..8a833671f 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="256e047", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="2dd5339", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="256e047", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="2dd5339", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From e725e4b879b062f0747f86e96bfac7ff8d2cbf5e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Thu, 23 May 2024 22:26:16 +0000 Subject: [PATCH 135/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 8a833671f..e06759ac0 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="2dd5339", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="f146899", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="2dd5339", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="f146899", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 17c053742f7b25ee5305b904d655c1bb9f683b74 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Thu, 23 May 2024 22:33:38 +0000 Subject: [PATCH 136/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index e06759ac0..be29d1392 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="f146899", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="e12c054", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="f146899", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="e12c054", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From a76f222e2905a62315670fa972d699f9adcf838b Mon Sep 17 00:00:00 2001 From: konsougiou Date: Thu, 23 May 2024 22:53:50 +0000 Subject: [PATCH 137/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index be29d1392..07b793a86 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="e12c054", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="8f45236", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="e12c054", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="8f45236", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 075eb04596fab853cb43f7de513cb0c161f76c77 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 11:48:58 +0000 Subject: [PATCH 138/176] update nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 07b793a86..81c36f782 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="8f45236", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="a093af9", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="8f45236", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="a093af9", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 42efcc060ac3fe89357c7089e8c813e5a8ebf0e4 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 11:59:54 +0000 Subject: [PATCH 139/176] update nydsu --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 81c36f782..b6feaccab 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="a093af9", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="8239fb9", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="a093af9", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="8239fb9", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 80e3565143dbdd169cfedf8760f38af26aa87958 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 13:37:11 +0000 Subject: [PATCH 140/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index b6feaccab..9c65d9479 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="8239fb9", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="b313462", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="8239fb9", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="b313462", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From b02647ee3290271ef72fb0c2f4ad563e85e35c61 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 13:44:36 +0000 Subject: [PATCH 141/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 9c65d9479..199a5bb31 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="b313462", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="c71343f", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="b313462", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="c71343f", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 115152f1b941e4519dd6db45bcb3198951d0074a Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 14:10:21 +0000 Subject: [PATCH 142/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 199a5bb31..f1bded6bc 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="c71343f", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="896c862", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="c71343f", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="896c862", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 8023b0def34dff66d9db9c3a19a840ba1e1e95d6 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 14:26:11 +0000 Subject: [PATCH 143/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index f1bded6bc..dbd119de7 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="896c862", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="43b67bc", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="896c862", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="43b67bc", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 0bf09e94cdddd23eba815e08d04419a09adbe20e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 14:56:58 +0000 Subject: [PATCH 144/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index dbd119de7..de2c29698 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="43b67bc", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="f636487", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="43b67bc", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="f636487", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From eadc6596bfd00056d62f141df7d6f8c76debe1fd Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 14:59:13 +0000 Subject: [PATCH 145/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index de2c29698..aa018075e 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="f636487", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="4973916", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="f636487", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="4973916", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 34563557d4da0735de4115349d510df26b1c0c91 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 16:11:44 +0000 Subject: [PATCH 146/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index aa018075e..9f356c774 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="4973916", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="813bb05", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="4973916", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="813bb05", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From e5684716cb3c92fd64791d1e14a5a0b3498cb71b Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 16:14:19 +0000 Subject: [PATCH 147/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 9f356c774..3e674cd89 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="813bb05", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="bd2304e", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="813bb05", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="bd2304e", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 2a523c80ba9dc78cb519ad5fb314f6cd86910b3e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 16:16:51 +0000 Subject: [PATCH 148/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 3e674cd89..7d8678bc3 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="bd2304e", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="e579224", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="bd2304e", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="e579224", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 6853c76a9905fb58f2ce2b515797f8de82c20a73 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 16:21:43 +0000 Subject: [PATCH 149/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 7d8678bc3..b80b76186 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="e579224", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="1d6b8c2", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="e579224", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="1d6b8c2", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From c65a0faf357d53036f04c8ff83b6abfb7678755c Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 16:24:59 +0000 Subject: [PATCH 150/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index b80b76186..e10be497f 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="1d6b8c2", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="1509b51", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="1d6b8c2", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="1509b51", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From f8b0f6a57b8c706023dc3dca8510a3f9fee131a5 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 16:27:41 +0000 Subject: [PATCH 151/176] nydus --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index e10be497f..81bda4c23 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="1509b51", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="e8b261d", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="1509b51", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="e8b261d", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 26ed375badf026cddf4bf299aaceb6efba125ba1 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 18:26:28 +0000 Subject: [PATCH 152/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 81bda4c23..4777ceab0 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="e8b261d", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="598ce0c", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="e8b261d", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="598ce0c", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 39f06373dd079e46cb4d84cded7845953a93b6f7 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 23:33:12 +0000 Subject: [PATCH 153/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 4777ceab0..0abc8f0a3 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="598ce0c", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="1c3fd76", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="598ce0c", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="1c3fd76", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 130a70bb7870cb1b149b41b34ba7a6e4efa0e55e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Fri, 24 May 2024 23:36:27 +0000 Subject: [PATCH 154/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 0abc8f0a3..5a8f7fe01 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="1c3fd76", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="65f72c8", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="1c3fd76", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="65f72c8", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From b9ed5ee45886cfab2e09e51faa79e2d3c6de149f Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 11:13:53 +0000 Subject: [PATCH 155/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 5a8f7fe01..008b45d96 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="65f72c8", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="e3432e6", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="65f72c8", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="e3432e6", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 11073d7d52edeedaefdd94992adcb09622c07aff Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 11:41:55 +0000 Subject: [PATCH 156/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 008b45d96..60a9855a1 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="e3432e6", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="eeed498", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="e3432e6", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="eeed498", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 58b735cc4e6aa75a4212af5f4876b1205775f391 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 12:08:08 +0000 Subject: [PATCH 157/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 60a9855a1..cea27a334 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="eeed498", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="ea63244", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="eeed498", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="ea63244", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 957fa4d95fb6b325637641e80fa0cf9dac8872e5 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 14:16:24 +0000 Subject: [PATCH 158/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index cea27a334..f30359b98 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="ea63244", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="444a175", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="ea63244", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="444a175", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 441c5ff34aff18825c149f81f40d193e4357ddd3 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 14:32:41 +0000 Subject: [PATCH 159/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index f30359b98..bf425298f 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="444a175", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="4ff7b31", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="444a175", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="4ff7b31", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From bfab6252842de2870835b3323a66e4349b52cda9 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 14:44:03 +0000 Subject: [PATCH 160/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index bf425298f..0a25d5b03 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="4ff7b31", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="932d13a", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="4ff7b31", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="932d13a", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 9cf1b34d69236229187f627f4d7ee8c3d1ec31b0 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 14:52:51 +0000 Subject: [PATCH 161/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 0a25d5b03..a131b0a74 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="932d13a", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="31bc57d", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="932d13a", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="31bc57d", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 1ec97c5f3001a05ba445288ffd35b2231e3923f8 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 15:27:14 +0000 Subject: [PATCH 162/176] fix --- image-rs/Cargo.toml | 4 ++-- image-rs/src/verity/dmverity.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index a131b0a74..f9f5496f4 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="31bc57d", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="697b76e", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="31bc57d", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="697b76e", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] diff --git a/image-rs/src/verity/dmverity.rs b/image-rs/src/verity/dmverity.rs index 27ad705e7..30d086764 100644 --- a/image-rs/src/verity/dmverity.rs +++ b/image-rs/src/verity/dmverity.rs @@ -176,7 +176,7 @@ fn start_udev() { let check_udev = Command::new("pgrep") .args(&["-x", "systemd-udevd"]) .output() - .expect("KS (image-rs) Failed to execute pgrep"); + .expect("KS (image-rs) Failed to exec pgrep"); if check_udev.status.success() { println!("KS (image-rs) udev daemon sucesfully started."); From 0d8912ea853e9fd7bfebc5bd07ddcd08370d55bc Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 15:32:50 +0000 Subject: [PATCH 163/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index f9f5496f4..e8fc8cf43 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="697b76e", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="9434541", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="697b76e", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="9434541", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 11fa750077434043715f0c7407531daac1dfae5e Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 15:34:44 +0000 Subject: [PATCH 164/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index e8fc8cf43..a83bf8ceb 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="9434541", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="befcaf1", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="9434541", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="befcaf1", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 3171502489d83c53257ebb37787e81560da66ecb Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 15:40:12 +0000 Subject: [PATCH 165/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index a83bf8ceb..17c73a6ed 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="befcaf1", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="30d4788", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="befcaf1", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="30d4788", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 583ef4a150770b07d0842b2b72a6c5f1046b5298 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 15:42:57 +0000 Subject: [PATCH 166/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 17c73a6ed..f9459ea9d 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="30d4788", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="cc70a81", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="30d4788", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="cc70a81", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 8e0c3e2dce6fb0a01778fae3672765768924eb05 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 16:48:48 +0000 Subject: [PATCH 167/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index f9459ea9d..19ed19113 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="cc70a81", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="157d486", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="cc70a81", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="157d486", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From b5a742026abe964671e1a81caeaacc088ce5232a Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 16:50:23 +0000 Subject: [PATCH 168/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 19ed19113..476c871de 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="157d486", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="80b9172", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="157d486", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="80b9172", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 208ba00f6f11c41900a838cea0b9432e833aeaa6 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 17:09:50 +0000 Subject: [PATCH 169/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 476c871de..decc25ab4 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="80b9172", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="38db171", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="80b9172", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="38db171", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 1c0ffab89dab916e662c892bc265db3358975fbc Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 17:10:57 +0000 Subject: [PATCH 170/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index decc25ab4..3cdbc0ca6 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="38db171", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="48f72ba", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="38db171", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="48f72ba", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From bceaf249e419db18f7ba9d0751bb1ae3d19a688a Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 17:12:58 +0000 Subject: [PATCH 171/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 3cdbc0ca6..c2e291f9c 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="48f72ba", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="d22e47a", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="48f72ba", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="d22e47a", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 287e69b47c9b23457371ba82ec801c8456e9f87c Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 17:16:20 +0000 Subject: [PATCH 172/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index c2e291f9c..2bcdcccee 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="d22e47a", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="0fa2c50", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="d22e47a", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="0fa2c50", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From a7bb03053fc1f024bffe9e4abdf5a7d59d3e964a Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 17:21:19 +0000 Subject: [PATCH 173/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index 2bcdcccee..ed1bf1db6 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="0fa2c50", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="62e7022", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="0fa2c50", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="62e7022", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From acf1d2f5f177ca07c6638fe88b8cf6c702003ab2 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sat, 25 May 2024 19:06:26 +0000 Subject: [PATCH 174/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index ed1bf1db6..e5976d013 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="62e7022", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="048656a", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="62e7022", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="048656a", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 6cc3115b3c8160f8650527a0d271ff60cc33df46 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 26 May 2024 11:25:51 +0000 Subject: [PATCH 175/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index e5976d013..e9353efc6 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="048656a", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="0199c2e", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="048656a", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="0199c2e", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies] From 233e4ff56553002259b8fca88fff282b38e6a207 Mon Sep 17 00:00:00 2001 From: konsougiou Date: Sun, 26 May 2024 14:17:07 +0000 Subject: [PATCH 176/176] fix --- image-rs/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-rs/Cargo.toml b/image-rs/Cargo.toml index e9353efc6..17c3fc00d 100644 --- a/image-rs/Cargo.toml +++ b/image-rs/Cargo.toml @@ -51,9 +51,9 @@ url = "2.2.2" walkdir = "2" zstd = "0.12" -nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="0199c2e", default-features = false, optional = true} +nydus-api = { git="https://github.com/konsougiou/nydus.git", rev="440eee9", default-features = false, optional = true} #nydus-api = { version = "0.3.0", optional = true} -nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="0199c2e", features = ["coco"], default-features = false, optional = true} +nydus-service = { git="https://github.com/konsougiou/nydus.git", rev="440eee9", features = ["coco"], default-features = false, optional = true} #nydus-service = { version = "0.3.0", features = ["coco"], optional = true} [build-dependencies]