rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-07 13:32:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add tenant_id to safekeeper spans.

Browse Source 
Now that it's hard to map timeline id into project in the console, this should
help a little.
This commit is contained in:
Arseny Sher
2022-12-27 16:33:19 +04:00
committed by Arseny Sher
parent fee8bf3a17
commit f6bf7b2003
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
safekeeper/src/receive_wal.rs
View File

@@ -52,7 +52,7 @@ impl<'pg> ReceiveWalConn<'pg> {
/// Receive WAL from wal_proposer
pub fn run(&mut self, spg: &mut SafekeeperPostgresHandler) -> Result<()> {
let _enter = info_span!("WAL acceptor", timeline = %spg.timeline_id.unwrap()).entered();
let _enter = info_span!("WAL acceptor", ttid = %spg.ttid).entered();
// Notify the libpq client that it's allowed to send `CopyData` messages
self.pg_backend
@@ -69,7 +69,7 @@ impl<'pg> ReceiveWalConn<'pg> {
let tli = match next_msg {
ProposerAcceptorMessage::Greeting(ref greeting) => {
info!(
"start handshake with wal proposer {} sysid {} timeline {}",
"start handshake with walproposer {} sysid {} timeline {}",
self.peer_addr, greeting.system_id, greeting.tli,
);
let server_info = ServerInfo {

15
safekeeper/src/safekeeper.rs
View File

@@ -634,10 +634,12 @@ where
// system_id will be updated on mismatch
if self.state.server.system_id != msg.system_id {
warn!(
"unexpected system ID arrived, got {}, expected {}",
msg.system_id, self.state.server.system_id
);
if self.state.server.system_id != 0 {
warn!(
"unexpected system ID arrived, got {}, expected {}",
msg.system_id, self.state.server.system_id
);
}
let mut state = self.state.clone();
state.server.system_id = msg.system_id;
@@ -648,8 +650,9 @@ where
}
info!(
"processed greeting from proposer {:?}, sending term {:?}",
msg.proposer_id, self.state.acceptor_state.term
"processed greeting from walproposer {}, sending term {:?}",
msg.proposer_id.map(|b| format!("{:X}", b)).join(""),
self.state.acceptor_state.term
);
Ok(Some(AcceptorProposerMessage::Greeting(AcceptorGreeting {
term: self.state.acceptor_state.term,

2
safekeeper/src/send_wal.rs
View File

@@ -161,7 +161,7 @@ impl ReplicationConn {
pgb: &mut PostgresBackend,
mut start_pos: Lsn,
) -> Result<()> {
let _enter = info_span!("WAL sender", timeline = %spg.timeline_id.unwrap()).entered();
let _enter = info_span!("WAL sender", ttid = %spg.ttid).entered();
let tli = GlobalTimelines::get(spg.ttid)?;