From 1209572cec51e28387ba6e82346171dbb23b3ccb Mon Sep 17 00:00:00 2001 From: Bojan Serafimov Date: Mon, 12 Sep 2022 10:36:56 -0400 Subject: [PATCH] Pass msg to tracer --- pageserver/src/page_service.rs | 7 ++++--- pageserver/src/trace.rs | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index e96e14263e..f0b672c40a 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -46,7 +46,8 @@ use postgres_ffi::v14::pg_constants::DEFAULTTABLESPACE_OID; use postgres_ffi::BLCKSZ; // Wrapped in libpq CopyData -enum PagestreamFeMessage { +// TODO these should be in a library outside the pageserver +pub enum PagestreamFeMessage { Exists(PagestreamExistsRequest), Nblocks(PagestreamNblocksRequest), GetPage(PagestreamGetPageRequest), @@ -54,7 +55,7 @@ enum PagestreamFeMessage { } // Wrapped in libpq CopyData -enum PagestreamBeMessage { +pub enum PagestreamBeMessage { Exists(PagestreamExistsResponse), Nblocks(PagestreamNblocksResponse), GetPage(PagestreamGetPageResponse), @@ -484,7 +485,7 @@ impl PageServerHandler { // Trace request if needed if let Some(t) = tracer.as_mut() { - t.trace() // TODO(now) pass zenith_fe_msg + t.trace(&zenith_fe_msg) } let response = match zenith_fe_msg { diff --git a/pageserver/src/trace.rs b/pageserver/src/trace.rs index fecef65604..74f80532e8 100644 --- a/pageserver/src/trace.rs +++ b/pageserver/src/trace.rs @@ -1,3 +1,5 @@ +use crate::page_service::PagestreamFeMessage; + pub struct Tracer {} impl Drop for Tracer { @@ -11,7 +13,7 @@ impl Tracer { Tracer {} } - pub fn trace(&mut self) { + pub fn trace(&mut self, _msg: &PagestreamFeMessage) { // TODO(now) implement }