From e7b92596757f71f284846f0229c11c2ac0fdc245 Mon Sep 17 00:00:00 2001 From: Alek Westover Date: Tue, 20 Jun 2023 22:48:43 -0400 Subject: [PATCH] more debugging, didn't find the problem --- compute_tools/src/extension_server.rs | 12 ++++++++++-- libs/remote_storage/src/s3_bucket.rs | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/compute_tools/src/extension_server.rs b/compute_tools/src/extension_server.rs index 6ebdeb1ec8..905126aab6 100644 --- a/compute_tools/src/extension_server.rs +++ b/compute_tools/src/extension_server.rs @@ -91,10 +91,18 @@ pub async fn download_extension( let remote_storage = GenericRemoteStorage::from_config(config)?; std::fs::write("alek/proof", "proof")?; + if let GenericRemoteStorage::AwsS3(my_bucket) = remote_storage.clone() { + let storage_details = format!( + "{:?}, {:?}", + my_bucket.bucket_name, my_bucket.prefix_in_bucket + ); + std::fs::write("alek/storagedetails", storage_details)?; + } // // this is just for testing doing a testing thing - // let folder = RemotePath::new(Path::new("public_extensions"))?; - // let from_paths = remote_storage.list_files(Some(&folder)).await?; + let folder = RemotePath::new(Path::new("public_extensions"))?; + let from_paths = remote_storage.list_files(Some(&folder)).await?; + std::fs::write("alek/antiproof", "antiproof")?; // let some_path = from_paths[0] // .object_name() // .expect("had a problem with somepath in extension server"); diff --git a/libs/remote_storage/src/s3_bucket.rs b/libs/remote_storage/src/s3_bucket.rs index 43d818dfb9..557dfd9ca5 100644 --- a/libs/remote_storage/src/s3_bucket.rs +++ b/libs/remote_storage/src/s3_bucket.rs @@ -116,8 +116,8 @@ pub(super) mod metrics { /// AWS S3 storage. pub struct S3Bucket { client: Client, - bucket_name: String, - prefix_in_bucket: Option, + pub bucket_name: String, // TODO: undo making these public + pub prefix_in_bucket: Option, max_keys_per_list_response: Option, // Every request to S3 can be throttled or cancelled, if a certain number of requests per second is exceeded. // Same goes to IAM, which is queried before every S3 request, if enabled. IAM has even lower RPS threshold.