Merge branch 'main' into rocksdb_pageserver

Cargo.lock

@@ -1382,8 +1382,6 @@ dependencies = [
  "crc32c",
  "crossbeam-channel",
  "daemonize",
- "fs2",
- "fs_extra",
  "futures",
  "hex",
  "lazy_static",
@@ -2544,31 +2542,24 @@ dependencies = [
  "anyhow",
  "byteorder",
  "bytes",
- "chrono",
  "clap",
  "crc32c",
- "crossbeam-channel",
  "daemonize",
  "fs2",
- "futures",
  "lazy_static",
  "log",
  "pageserver",
  "postgres",
  "postgres-protocol",
- "rand 0.8.3",
  "regex",
- "rust-s3",
  "slog",
  "slog-async",
  "slog-scope",
  "slog-stdlog",
  "slog-term",
- "termion",
  "tokio",
  "tokio-postgres",
  "tokio-stream",
- "tui",
 ]
 
 [[package]]
@@ -2759,7 +2750,6 @@ dependencies = [
  "control_plane",
  "pageserver",
  "postgres_ffi",
- "walkeeper",
 ]
 
 [[package]]

control_plane/src/compute.rs

@@ -238,7 +238,7 @@ impl PostgresNode {
         let mut client = self
             .pageserver
             .page_server_psql_client()
-            .with_context(|| "connecting to page erver failed")?;
+            .with_context(|| "connecting to page server failed")?;
 
         fs::create_dir_all(&pgdata)
             .with_context(|| format!("could not create data directory {}", pgdata.display()))?;

integration_tests/tests/test_pageserver.rs

@@ -7,7 +7,6 @@ use control_plane::storage::TestStorageControlPlane;
 // XXX: force all redo at the end
 // -- restart + seqscan won't read deleted stuff
 // -- pageserver api endpoint to check all rels
-/*
 #[test]
 fn test_redo_cases() {
     let local_env = local_env::test_env("test_redo_cases");
@@ -48,7 +47,7 @@ fn test_redo_cases() {
     println!("sum = {}", count);
     assert_eq!(count, 5000050000);
 }
-*/
+
 // Runs pg_regress on a compute node
 #[test]
 fn test_regress() {

pageserver/Cargo.toml

@@ -13,8 +13,6 @@ rand = "0.8.3"
 regex = "1.4.5"
 bytes = "1.0.1"
 byteorder = "1.4.3"
-fs2 = "0.4.3"
-fs_extra = "1.2.0"
 futures = "0.3.13"
 lazy_static = "1.4.0"
 slog-stdlog = "4.1.0"

pageserver/src/tui.rs

@@ -91,7 +91,7 @@ pub fn init_logging() -> slog_scope::GlobalLoggerGuard {
     return slog_scope::set_global_logger(logger);
 }
 
-pub fn ui_main<'b>() -> Result<(), Box<dyn Error>> {
+pub fn ui_main() -> Result<(), Box<dyn Error>> {
     // Terminal initialization
     let stdout = io::stdout().into_raw_mode()?;
     let stdout = MouseTerminal::from(stdout);
@@ -229,7 +229,7 @@ impl<'a> Widget for LogWidget<'a> {
 // Render a widget to show some metrics
 struct MetricsWidget {}
 
-fn get_metric_u64<'a>(title: &'a str, value: u64) -> Spans<'a> {
+fn get_metric_u64(title: &str, value: u64) -> Spans {
     Spans::from(vec![
         Span::styled(format!("{:<20}", title), Style::default()),
         Span::raw(": "),
@@ -240,7 +240,7 @@ fn get_metric_u64<'a>(title: &'a str, value: u64) -> Spans<'a> {
     ])
 }
 
-fn get_metric_str<'a>(title: &'a str, value: &'a str) -> Spans<'a> {
+fn get_metric_str<'a>(title: &str, value: &'a str) -> Spans<'a> {
     Spans::from(vec![
         Span::styled(format!("{:<20}", title), Style::default()),
         Span::raw(": "),

pageserver/src/tui_logger.rs

@@ -167,7 +167,7 @@ impl<'b> Widget for TuiLoggerWidget<'b> {
                         Level::Debug => (self.style_debug, "DEBUG", true),
                         Level::Trace => (self.style_trace, "TRACE", true),
                     };
-                    line.push(Span::styled(txt, lvl_style.unwrap_or(Style::default())));
+                    line.push(Span::styled(txt, lvl_style.unwrap_or_default()));
 
                     if self.show_module {
                         line.push(Span::raw(" "));

walkeeper/Cargo.toml

@@ -7,14 +7,10 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-chrono = "0.4.19"
-crossbeam-channel = "0.5.0"
-rand = "0.8.3"
 regex = "1.4.5"
 bytes = "1.0.1"
 byteorder = "1.4.3"
 fs2 = "0.4.3"
-futures = "0.3.13"
 lazy_static = "1.4.0"
 slog-stdlog = "4.1.0"
 slog-async = "2.6.0"
@@ -23,10 +19,7 @@ slog-term = "2.8.0"
 slog = "2.7.0"
 log = "0.4.14"
 clap = "2.33.0"
-termion = "1.5.6"
-tui = "0.14.0"
 daemonize = "0.4.1"
-rust-s3 = { git = "https://github.com/hlinnaka/rust-s3", rev="7f15a24ec7daa0a5d9516da706212745f9042818", features = ["no-verify-ssl"] }
 tokio = { version = "1.3.0", features = ["full"] }
 tokio-stream = { version = "0.1.4" }
 tokio-postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="a0d067b66447951d1276a53fb09886539c3fa094" }

walkeeper/src/wal_service.rs

@@ -3,8 +3,6 @@
 //   receive WAL from wal_proposer and send it to WAL receivers
 //
 
-extern crate fs2;
-
 use byteorder::{BigEndian, ByteOrder};
 use bytes::{Buf, BufMut, Bytes, BytesMut};
 use fs2::FileExt;

zenith/Cargo.toml

@@ -12,6 +12,5 @@ anyhow = "1.0"
 
 # FIXME: 'pageserver' is needed for ZTimelineId. Refactor
 pageserver = { path = "../pageserver" }
-walkeeper = { path = "../walkeeper" }
 control_plane = { path = "../control_plane" }
 postgres_ffi = { path = "../postgres_ffi" }