|
3 | 3 | use crate::cli::CommandLineArgs; |
4 | 4 | use crate::error::ActiveStorageError; |
5 | 5 | use crate::filter_pipeline; |
6 | | -use crate::metrics::{metrics_handler, track_metrics}; |
| 6 | +use crate::metrics::{metrics_handler, track_metrics, LOCAL_CACHE_MISSES}; |
7 | 7 | use crate::models; |
8 | 8 | use crate::operation; |
9 | 9 | use crate::operations; |
@@ -160,37 +160,6 @@ async fn schema() -> &'static str { |
160 | 160 | "Hello, world!" |
161 | 161 | } |
162 | 162 |
|
163 | | -// /// Download an object from S3 |
164 | | -// /// |
165 | | -// /// Requests a byte range if `offset` or `size` is specified in the request. |
166 | | -// /// |
167 | | -// /// # Arguments |
168 | | -// /// |
169 | | -// /// * `client`: S3 client object |
170 | | -// /// * `request_data`: RequestData object for the request |
171 | | -// #[tracing::instrument( |
172 | | -// level = "DEBUG", |
173 | | -// skip(client, request_data, resource_manager, mem_permits) |
174 | | -// )] |
175 | | -// async fn download_object<'a>( |
176 | | -// client: &s3_client::S3Client, |
177 | | -// request_data: &models::RequestData, |
178 | | -// resource_manager: &'a ResourceManager, |
179 | | -// mem_permits: &mut Option<SemaphorePermit<'a>>, |
180 | | -// ) -> Result<Bytes, ActiveStorageError> { |
181 | | -// let range = s3_client::get_range(request_data.offset, request_data.size); |
182 | | -// let _conn_permits = resource_manager.s3_connection().await?; |
183 | | -// client |
184 | | -// .download_object( |
185 | | -// &request_data.bucket, |
186 | | -// &request_data.object, |
187 | | -// range, |
188 | | -// resource_manager, |
189 | | -// mem_permits, |
190 | | -// ) |
191 | | -// .await |
192 | | -// } |
193 | | - |
194 | 163 | /// Download an object from S3 |
195 | 164 | /// |
196 | 165 | /// Requests a byte range if `offset` or `size` is specified in the request. |
@@ -219,9 +188,10 @@ async fn download_object<'a>( |
219 | 188 | ) -> Result<Bytes, ActiveStorageError> { |
220 | 189 | let range = s3_client::get_range(request_data.offset, request_data.size); |
221 | 190 | // let _conn_permits = resource_manager.s3_connection().await?; |
222 | | - // println!("{:?},{:?}", client, request_data); |
223 | | - // TODO: Add cache hit / miss statistics? |
224 | | - println!("Downloading object"); |
| 191 | + |
| 192 | + // Increment the prometheus metric for cache misses |
| 193 | + LOCAL_CACHE_MISSES.with_label_values(&["disk"]).inc(); |
| 194 | + |
225 | 195 | client |
226 | 196 | .download_object( |
227 | 197 | &request_data.bucket, |
|
0 commit comments