From 6331bc157f0527dde92b8dca7f8945a4318da56f Mon Sep 17 00:00:00 2001 From: Vlad Lazar Date: Thu, 15 Feb 2024 11:04:36 +0000 Subject: [PATCH] pagebench: accept connstring for basebackup bench (cherry picked from commit 49f4feee403eca3ddce3a468c98872767c4fee9c) --- pageserver/pagebench/src/cmd/basebackup.rs | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pageserver/pagebench/src/cmd/basebackup.rs b/pageserver/pagebench/src/cmd/basebackup.rs index 2d61b0e252..aa64cfa36b 100644 --- a/pageserver/pagebench/src/cmd/basebackup.rs +++ b/pageserver/pagebench/src/cmd/basebackup.rs @@ -8,7 +8,7 @@ use utils::lsn::Lsn; use rand::prelude::*; use tokio::sync::Barrier; use tokio::task::JoinSet; -use tracing::{debug, info, instrument}; +use tracing::{info, instrument}; use std::collections::HashMap; use std::num::NonZeroUsize; @@ -28,6 +28,8 @@ pub(crate) struct Args { #[clap(long, default_value = "localhost:64000")] page_service_host_port: String, #[clap(long)] + page_service_connstring: Option, + #[clap(long)] pageserver_jwt: Option, #[clap(long, default_value = "1")] num_clients: NonZeroUsize, @@ -230,12 +232,17 @@ async fn client( ) { start_work_barrier.wait().await; - let client = pageserver_client::page_service::Client::new(crate::util::connstring::connstring( - &args.page_service_host_port, - args.pageserver_jwt.as_deref(), - )) - .await - .unwrap(); + let connstr = match &args.page_service_connstring { + Some(connstr) => connstr.clone(), + None => crate::util::connstring::connstring( + &args.page_service_host_port, + args.pageserver_jwt.as_deref(), + ), + }; + + let client = pageserver_client::page_service::Client::new(connstr) + .await + .unwrap(); while let Some(Work { lsn, gzip }) = work.recv().await { let start = Instant::now(); @@ -263,7 +270,7 @@ async fn client( } }) .await; - debug!("basebackup size is {} bytes", size.load(Ordering::Relaxed)); + info!("basebackup size is {} bytes", size.load(Ordering::Relaxed)); let elapsed = start.elapsed(); live_stats.inc(); STATS.with(|stats| {