Skip to content

Commit

Permalink
Fix mountpoint-s3-crt after CRT update
Browse files Browse the repository at this point in the history
Signed-off-by: Alessandro Passaro <[email protected]>
  • Loading branch information
passaro committed Sep 21, 2023
1 parent ebedda6 commit 1825d52
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions mountpoint-s3-client/src/s3_crt_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,8 @@ impl S3CrtClientInner {
metrics.num_requests_stream_queued_waiting as u64
);
metrics::absolute_counter!(
"s3.client.num_requests_streaming",
metrics.num_requests_streaming as u64
"s3.client.num_requests_streaming_response",
metrics.num_requests_streaming_response as u64
);
}

Expand Down
10 changes: 5 additions & 5 deletions mountpoint-s3-crt/src/s3/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ impl Drop for MetaRequest {
/// (3.3) num_auto_ranged_put_network_io
/// (3.4) num_auto_ranged_copy_network_io
/// (4) num_requests_stream_queued_waiting: responses from the server are added into meta request priority queue, waiting to be streamed.
/// (5) num_requests_streaming: responses are removed from the queue and streamed back to the callers.
/// (5) num_requests_streaming_response: responses are removed from the queue and streamed back to the callers.
#[derive(Debug, Default)]
#[non_exhaustive]
pub struct ClientMetrics {
Expand Down Expand Up @@ -529,8 +529,8 @@ pub struct ClientMetrics {
/// Number of requests sitting in their meta request priority queue, waiting to be streamed.
pub num_requests_stream_queued_waiting: u32,

/// Number of requests currently scheduled to be streamed or are actively being streamed.
pub num_requests_streaming: u32,
/// Number of requests currently scheduled to be streamed the response body or are actively being streamed.
pub num_requests_streaming_response: u32,
}

impl ClientMetrics {
Expand Down Expand Up @@ -615,7 +615,7 @@ impl Client {
let num_requests_stream_queued_waiting =
aws_atomic_load_int(&stats.num_requests_stream_queued_waiting) as u32;

let num_requests_streaming = aws_atomic_load_int(&stats.num_requests_streaming) as u32;
let num_requests_streaming_response = aws_atomic_load_int(&stats.num_requests_streaming_response) as u32;

// These are "threaded data" and so technically we don't know that it's safe to read them
// here, but it's just metrics data so we're not too concerned.
Expand All @@ -631,7 +631,7 @@ impl Client {
num_auto_ranged_put_network_io,
num_auto_ranged_copy_network_io,
num_requests_stream_queued_waiting,
num_requests_streaming,
num_requests_streaming_response,
}
}
}
Expand Down

0 comments on commit 1825d52

Please sign in to comment.