From e7f12602d7ad0520e020e09dc968d61fab26ccb4 Mon Sep 17 00:00:00 2001 From: evenyag Date: Fri, 2 Jun 2023 21:43:35 +0800 Subject: [PATCH] feat: don't add timeout to perf api --- src/servers/src/http.rs | 54 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/src/servers/src/http.rs b/src/servers/src/http.rs index 320abf9c42de..2999dfdd1365 100644 --- a/src/servers/src/http.rs +++ b/src/servers/src/http.rs @@ -139,7 +139,7 @@ impl Default for HttpOptions { fn default() -> Self { Self { addr: "127.0.0.1:4000".to_string(), - timeout: Duration::from_secs(30), + timeout: Duration::from_secs(3), disable_dashboard: false, } } @@ -504,18 +504,18 @@ impl HttpServer { } // prof routers - router = router.nest( - &format!("/{HTTP_API_VERSION}/prof"), - Router::new() - .route( - "/cpu", - routing::get(pprof::pprof_handler).post(pprof::pprof_handler), - ) - .route( - "/mem", - routing::get(mem_prof::mem_prof_handler).post(mem_prof::mem_prof_handler), - ), - ); + // router = router.nest( + // &format!("/{HTTP_API_VERSION}/prof"), + // Router::new() + // .route( + // "/cpu", + // routing::get(pprof::pprof_handler).post(pprof::pprof_handler), + // ) + // .route( + // "/mem", + // routing::get(mem_prof::mem_prof_handler).post(mem_prof::mem_prof_handler), + // ), + // ); if let Some(metrics_handler) = self.metrics_handler { router = router.nest("", self.route_metrics(metrics_handler)); @@ -561,6 +561,19 @@ impl HttpServer { HttpAuth::::new(self.user_provider.clone()), )), ) + // Handlers for debug, we don't expect a timeout. + .nest( + &format!("/{HTTP_API_VERSION}/prof"), + Router::new() + .route( + "/cpu", + routing::get(pprof::pprof_handler).post(pprof::pprof_handler), + ) + .route( + "/mem", + routing::get(mem_prof::mem_prof_handler).post(mem_prof::mem_prof_handler), + ), + ) } fn route_metrics(&self, metrics_handler: MetricsHandler) -> Router { @@ -614,21 +627,6 @@ impl HttpServer { .route("/flush", routing::post(flush)) .with_state(grpc_handler) } - - // fn route_prof(&self) -> Router { - // Router::new().route("/cpu", routing::get(crate::http::pprof::pprof)) - // // let mut router = Router::new(); - // // // cpu profiler - // // router = router.route("/cpu", routing::get(crate::http::pprof::pprof)); - - // // // mem profiler - // // #[cfg(feature = "mem-prof")] - // // { - // // router = router.route("/mem", routing::get(crate::http::mem_prof::mem_prof)); - // // } - - // // router - // } } /// A middleware to record metrics for HTTP.