Use saturating_sub for resident_physical_size_gauge

to avoid metric overflow, if the gauge is not initialized yet.
Bump tempfile from 3.3.0 to 3.4.0 (#3709 )
2026-06-02 21:10:38 +00:00 · 2023-02-28 16:00:41 +02:00 · 2023-02-27 12:44:08 +00:00
6 changed files with 21 additions and 81 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3067,15 +3067,6 @@ dependencies = [
 "workspace_hack",
 ]

-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.11.14"
@@ -3849,16 +3840,15 @@ dependencies = [

 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
 dependencies = [
 "cfg-if",
 "fastrand",
- "libc",
 "redox_syscall",
- "remove_dir_all",
- "winapi",
+ "rustix",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -4544,7 +4534,6 @@ dependencies = [
 "tracing",
 "tracing-subscriber",
 "url",
- "uuid",
 "workspace_hack",
 ]

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -150,7 +150,7 @@ workspace_hack = { version = "0.1", path = "./workspace_hack/" }
 criterion = "0.4"
 rcgen = "0.10"
 rstest = "0.16"
-tempfile = "3.2"
+tempfile = "3.4"
 tonic-build = "0.8"

 # This is only needed for proxy's tests.
--- a/libs/utils/Cargo.toml
+++ b/libs/utils/Cargo.toml
@@ -39,7 +39,7 @@ pq_proto.workspace = true

 workspace_hack.workspace = true
 url.workspace = true
-uuid = { version = "1.2", features = ["v4", "serde"] }
+
 [dev-dependencies]
 byteorder.workspace = true
 bytes.workspace = true
--- a/libs/utils/src/http/endpoint.rs
+++ b/libs/utils/src/http/endpoint.rs
@@ -63,26 +63,8 @@ async fn prometheus_metrics_handler(_req: Request<Body>) -> Result<Response<Body
    Ok(response)
 }

-pub fn add_request_id_middleware<B: hyper::body::HttpBody + Send + Sync + 'static>(
-) -> Middleware<B, ApiError> {
-    Middleware::pre(move |mut req| async move {
-        let headers = req.headers_mut();
-        let name = HeaderName::from_str("UUID").expect("created header name");
-        let request_id = uuid::Uuid::new_v4().to_string();
-        let value = HeaderValue::from_str(&request_id).unwrap();
-        headers.insert(name, value);
-        if req.method() == Method::GET {
-            tracing::debug!("{} {} {}", req.method(), req.uri().path(), request_id);
-        } else {
-            tracing::info!("{} {} {}", req.method(), req.uri().path(), request_id);
-        }
-        Ok(req)
-    })
-}
-
 pub fn make_router() -> RouterBuilder<hyper::Body, ApiError> {
    Router::builder()
-        .middleware(add_request_id_middleware())
        .middleware(Middleware::post_with_info(logger))
        .get("/metrics", prometheus_metrics_handler)
        .err_handler(error::handler)
--- a/pageserver/src/http/routes.rs
+++ b/pageserver/src/http/routes.rs
@@ -1,14 +1,9 @@
 use std::collections::HashMap;
-use std::str::FromStr;
 use std::sync::Arc;

 use anyhow::{anyhow, Context, Result};
-use futures::Future;
-use hyper::body::HttpBody;
-use hyper::header::HeaderName;
-use hyper::http::HeaderValue;
+use hyper::StatusCode;
 use hyper::{Body, Request, Response, Uri};
-use hyper::{Method, StatusCode};
 use metrics::launch_timestamp::LaunchTimestamp;
 use pageserver_api::models::DownloadRemoteLayersTaskSpawnRequest;
 use remote_storage::GenericRemoteStorage;
@@ -1162,42 +1157,6 @@ pub fn make_router(
            "/v1/tenant/:tenant_id/timeline/:timeline_id/layer/:layer_file_name",
            evict_timeline_layer_handler,
        )
-        .get(
-            "/v1/panic",
-            wrap_span("always_panic_handler", always_panic_handler),
-        )
+        .get("/v1/panic", always_panic_handler)
        .any(handler_404))
 }
-
-fn wrap_span<H, R, B, E>(
-    handler_name: &'static str,
-    handler: H,
-) -> impl Fn(Request<hyper::Body>) -> R
-where
-    H: Fn(Request<hyper::Body>) -> R + Send + Sync + 'static,
-    B: HttpBody + Send + Sync + 'static,
-    E: Into<Box<dyn std::error::Error + Send + Sync>>,
-    R: Future<Output = Result<Response<B>, E>> + Send + 'static,
-{
-    move |r| -> R {
-        async {
-            let headers = r.headers_mut();
-            let name = HeaderName::from_str("UUID").expect("created header name");
-            let request_id = "foo";
-            let value = HeaderValue::from_str(&request_id).unwrap();
-            headers.insert(name, value);
-            if r.method() == Method::GET {
-                tracing::debug!("{} {} {}", r.method(), r.uri().path(), request_id);
-            } else {
-                tracing::info!("{} {} {}", r.method(), r.uri().path(), request_id);
-            }
-            handler(r)
-                .instrument(info_span!(
-                    "request",
-                    handler = handler_name,
-                    request_id = request_id
-                ))
-                .await
-        }
-    }
-}
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -1082,7 +1082,10 @@ impl Timeline {
                }

                if let Some(layer_size) = layer_size {
-                    self.metrics.resident_physical_size_gauge.sub(layer_size);
+                    let current_size = self.metrics.resident_physical_size_gauge.get();
+                    self.metrics
+                        .resident_physical_size_gauge
+                        .set(current_size.saturating_sub(layer_size));
                }

                true
@@ -1504,7 +1507,11 @@ impl Timeline {
                            assert!(local_layer_path.exists(), "we would leave the local_layer without a file if this does not hold: {}", local_layer_path.display());
                            anyhow::bail!("could not rename file {local_layer_path:?}: {err:?}");
                        } else {
-                            self.metrics.resident_physical_size_gauge.sub(local_size);
+                            let current_size = self.metrics.resident_physical_size_gauge.get();
+                            self.metrics
+                                .resident_physical_size_gauge
+                                .set(current_size.saturating_sub(local_size));
+
                            updates.remove_historic(local_layer);
                            // fall-through to adding the remote layer
                        }
@@ -1946,7 +1953,10 @@ impl Timeline {

        layer.delete()?;
        if let Some(layer_size) = layer_size {
-            self.metrics.resident_physical_size_gauge.sub(layer_size);
+            let current_size = self.metrics.resident_physical_size_gauge.get();
+            self.metrics
+                .resident_physical_size_gauge
+                .set(current_size.saturating_sub(layer_size));
        }

        // TODO Removing from the bottom of the layer map is expensive.
Author	SHA1	Message	Date
Anastasia Lubennikova	0c8ed22939	Use saturating_sub for resident_physical_size_gauge to avoid metric overflow, if the gauge is not initialized yet.	2023-02-28 16:00:41 +02:00
Alexander Bayandin	000eb1b069	Bump tempfile from 3.3.0 to 3.4.0 (#3709 ) Update `tempfile` crate to get rid of `remove_dir_all` dependency Ref https://github.com/neondatabase/neon/security/dependabot/15	2023-02-27 12:44:08 +00:00