diff --git a/pageserver/src/tenant/timeline/walreceiver/walreceiver_connection.rs b/pageserver/src/tenant/timeline/walreceiver/walreceiver_connection.rs index ff6a080c52..bba9e51cdc 100644 --- a/pageserver/src/tenant/timeline/walreceiver/walreceiver_connection.rs +++ b/pageserver/src/tenant/timeline/walreceiver/walreceiver_connection.rs @@ -13,10 +13,10 @@ use fail::fail_point; use futures::StreamExt; use postgres_backend::is_expected_io_error; use postgres_connection::PgConnectionConfig; -use postgres_ffi::waldecoder::WalStreamDecoder; use postgres_ffi::WAL_SEGMENT_SIZE; use postgres_ffi::v14::xlog_utils::normalize_lsn; use postgres_ffi::waldecoder::WalDecodeError; +use postgres_ffi::waldecoder::WalStreamDecoder; use postgres_protocol::message::backend::ReplicationMessage; use postgres_types::PgLsn; use tokio::sync::watch; @@ -26,7 +26,7 @@ use tokio_postgres::replication::ReplicationStream; use tokio_postgres::{Client, SimpleQueryMessage, SimpleQueryRow}; use tokio_util::sync::CancellationToken; use tracing::{Instrument, debug, error, info, trace, warn}; -use utils::{critical_timeline}; +use utils::critical_timeline; use utils::id::NodeId; use utils::lsn::Lsn; use utils::pageserver_feedback::PageserverFeedback; @@ -464,7 +464,6 @@ pub(super) async fn handle_walreceiver_connection( timeline.timeline_id, Some(&timeline.corruption_detected), "{err:?}" - ); } })?; diff --git a/safekeeper/src/send_interpreted_wal.rs b/safekeeper/src/send_interpreted_wal.rs index 2eb221e32c..bfc4008c52 100644 --- a/safekeeper/src/send_interpreted_wal.rs +++ b/safekeeper/src/send_interpreted_wal.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use std::fmt::Display; -use std::sync::atomic::AtomicBool; use std::sync::Arc; +use std::sync::atomic::AtomicBool; use std::time::Duration; use anyhow::{Context, anyhow}; @@ -307,9 +307,9 @@ impl InterpretedWalReader { ttid.tenant_id, ttid.timeline_id, // Hadron: The corruption flag is only used in PS so that it can feed this information back to SKs. - // We do not use these flags in SKs. - None::<&AtomicBool>, - "failed to read WAL record: {err:?}" + // We do not use these flags in SKs. + None::<&AtomicBool>, + "failed to read WAL record: {err:?}" ); } err => error!("failed to read WAL record: {err}"), @@ -380,9 +380,9 @@ impl InterpretedWalReader { ttid.tenant_id, ttid.timeline_id, // Hadron: The corruption flag is only used in PS so that it can feed this information back to SKs. - // We do not use these flags in SKs. - None::<&AtomicBool>, - "failed to decode WAL record: {err:?}" + // We do not use these flags in SKs. + None::<&AtomicBool>, + "failed to decode WAL record: {err:?}" ); } Err(err) => error!("failed to read WAL record: {err}"),