From 3645133700a9cf63f60fb2cbeacd0db60f1f2b3b Mon Sep 17 00:00:00 2001 From: Konstantin Knizhnik Date: Thu, 20 May 2021 14:39:27 +0300 Subject: [PATCH] Fix conflicts with main branch --- integration_tests/tests/test_wal_acceptor.rs | 2 +- pageserver/src/repository/rocksdb.rs | 1 - pageserver/src/walreceiver.rs | 1 - pageserver/src/walredo.rs | 4 ---- walkeeper/src/receive_wal.rs | 6 +++--- walkeeper/src/replication.rs | 6 +++--- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/integration_tests/tests/test_wal_acceptor.rs b/integration_tests/tests/test_wal_acceptor.rs index a82883ea2c..6b3a035c1c 100644 --- a/integration_tests/tests/test_wal_acceptor.rs +++ b/integration_tests/tests/test_wal_acceptor.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use std::time::SystemTime; use std::{thread, time}; -use control_plane::compute::{PostgresNode, ComputeControlPlane}; +use control_plane::compute::{ComputeControlPlane, PostgresNode}; use integration_tests; use integration_tests::PostgresNodeExt; diff --git a/pageserver/src/repository/rocksdb.rs b/pageserver/src/repository/rocksdb.rs index 2550b46fd0..de6cce768e 100644 --- a/pageserver/src/repository/rocksdb.rs +++ b/pageserver/src/repository/rocksdb.rs @@ -376,7 +376,6 @@ impl RocksTimeline { Ok(0) } - fn do_gc(&self, conf: &'static PageServerConf) -> Result { loop { thread::sleep(conf.gc_period); diff --git a/pageserver/src/walreceiver.rs b/pageserver/src/walreceiver.rs index b0744afd18..e8992f944f 100644 --- a/pageserver/src/walreceiver.rs +++ b/pageserver/src/walreceiver.rs @@ -196,7 +196,6 @@ fn walreceiver_main( while let Some((lsn, recdata)) = waldecoder.poll_decode()? { let old_checkpoint_bytes = encode_checkpoint(checkpoint); - //info!("Decode WAL record at LSN {}", lsn); let decoded = decode_wal_record(&mut checkpoint, recdata.clone()); timeline.save_decoded_record(decoded, recdata, lsn)?; diff --git a/pageserver/src/walredo.rs b/pageserver/src/walredo.rs index a287ddd6b1..39aaf8fe6a 100644 --- a/pageserver/src/walredo.rs +++ b/pageserver/src/walredo.rs @@ -293,10 +293,6 @@ impl PostgresRedoManagerInternal { let mut status = 0; if info == pg_constants::XLOG_XACT_COMMIT { status = pg_constants::TRANSACTION_STATUS_COMMITTED; - info!( - "Mark transaction {} as committed at LSN {}", - xlogrec.xl_xid, lsn - ); transaction_id_set_status(xlogrec.xl_xid, status, &mut page); //handle subtrans let _xact_time = buf.get_i64_le(); diff --git a/walkeeper/src/receive_wal.rs b/walkeeper/src/receive_wal.rs index 47fc734197..1a261f6e7b 100644 --- a/walkeeper/src/receive_wal.rs +++ b/walkeeper/src/receive_wal.rs @@ -360,7 +360,7 @@ impl ReceiveWalConn { const ZERO_BLOCK: &[u8] = &[0u8; XLOG_BLCKSZ]; /* Extract WAL location for this block */ - let mut xlogoff = start_pos.segment_offset(wal_seg_size as u64) as usize; + let mut xlogoff = start_pos.segment_offset(wal_seg_size) as usize; while bytes_left != 0 { let bytes_to_write; @@ -376,7 +376,7 @@ impl ReceiveWalConn { } /* Open file */ - let segno = start_pos.segment_number(wal_seg_size as u64); + let segno = start_pos.segment_number(wal_seg_size); let wal_file_name = XLogFileName(timeline, segno, wal_seg_size); let wal_file_path = self .conf @@ -435,7 +435,7 @@ impl ReceiveWalConn { xlogoff += bytes_to_write; /* Did we reach the end of a WAL segment? */ - if start_pos.segment_offset(wal_seg_size as u64) == 0 { + if start_pos.segment_offset(wal_seg_size) == 0 { xlogoff = 0; if partial { fs::rename(&wal_file_partial_path, &wal_file_path)?; diff --git a/walkeeper/src/replication.rs b/walkeeper/src/replication.rs index 14e34ac8fc..d636b2731d 100644 --- a/walkeeper/src/replication.rs +++ b/walkeeper/src/replication.rs @@ -175,7 +175,7 @@ impl ReplicationConn { Some(file) => file, None => { // Open a new file. - let segno = start_pos.segment_number(wal_seg_size as u64); + let segno = start_pos.segment_number(wal_seg_size); let wal_file_name = XLogFileName(timeline, segno, wal_seg_size); let timeline_id = self.timeline.get().timelineid.to_string(); let wal_file_path = self.conf.data_dir.join(timeline_id).join(wal_file_name); @@ -183,7 +183,7 @@ impl ReplicationConn { } }; - let xlogoff = start_pos.segment_offset(wal_seg_size as u64) as usize; + let xlogoff = start_pos.segment_offset(wal_seg_size) as usize; // How much to read and send in message? We cannot cross the WAL file // boundary, and we don't want send more than MAX_SEND_SIZE. @@ -223,7 +223,7 @@ impl ReplicationConn { // Decide whether to reuse this file. If we don't set wal_file here // a new file will be opened next time. - if start_pos.segment_offset(wal_seg_size as u64) != 0 { + if start_pos.segment_offset(wal_seg_size) != 0 { wal_file = Some(file); } }