Bump pageserver dependencies

pageserver/src/bin/dump_layerfile.rs

@@ -13,7 +13,7 @@ fn main() -> Result<()> {
         .about("Dump contents of one layer file, for debugging")
         .version(GIT_VERSION)
         .arg(
-            Arg::with_name("path")
+            Arg::new("path")
                 .help("Path to file to dump")
                 .required(true)
                 .index(1),

pageserver/src/bin/pageserver.rs

@@ -27,27 +27,27 @@ fn main() -> Result<()> {
         .about("Materializes WAL stream to pages and serves them to the postgres")
         .version(GIT_VERSION)
         .arg(
-            Arg::with_name("daemonize")
-                .short("d")
+            Arg::new("daemonize")
+                .short('d')
                 .long("daemonize")
                 .takes_value(false)
                 .help("Run in the background"),
         )
         .arg(
-            Arg::with_name("init")
+            Arg::new("init")
                 .long("init")
                 .takes_value(false)
                 .help("Initialize pageserver repo"),
         )
         .arg(
-            Arg::with_name("workdir")
-                .short("D")
+            Arg::new("workdir")
+                .short('D')
                 .long("workdir")
                 .takes_value(true)
                 .help("Working directory for the pageserver"),
         )
         .arg(
-            Arg::with_name("create-tenant")
+            Arg::new("create-tenant")
                 .long("create-tenant")
                 .takes_value(true)
                 .help("Create tenant during init")
@@ -55,11 +55,11 @@ fn main() -> Result<()> {
         )
         // See `settings.md` for more details on the extra configuration patameters pageserver can process
         .arg(
-            Arg::with_name("config-override")
-                .short("c")
+            Arg::new("config-override")
+                .short('c')
                 .takes_value(true)
                 .number_of_values(1)
-                .multiple(true)
+                .multiple_occurrences(true)
                 .help("Additional configuration overrides of the ones from the toml config file (or new ones to add there).
                 Any option has to be a valid toml document, example: `-c \"foo='hey'\"` `-c \"foo={value=1}\"`"),
         )

pageserver/src/bin/pageserver_zst.rs

@@ -4,7 +4,7 @@
 use std::{collections::BTreeSet, path::Path};
 
 use anyhow::{bail, ensure, Context};
-use clap::{App, Arg, SubCommand};
+use clap::{App, Arg};
 use pageserver::{
     layered_repository::metadata::{TimelineMetadata, METADATA_FILE_NAME},
     remote_storage::compression,
@@ -26,38 +26,38 @@ async fn main() -> anyhow::Result<()> {
     let arg_matches = App::new("pageserver zst blob [un]compressor utility")
         .version(GIT_VERSION)
         .subcommands(vec![
-            SubCommand::with_name(LIST_SUBCOMMAND)
+            App::new(LIST_SUBCOMMAND)
                 .about("List the archive contents")
                 .arg(
-                    Arg::with_name(ARCHIVE_ARG_NAME)
+                    Arg::new(ARCHIVE_ARG_NAME)
                         .required(true)
                         .takes_value(true)
                         .help("An archive to list the contents of"),
                 ),
-            SubCommand::with_name(EXTRACT_SUBCOMMAND)
+            App::new(EXTRACT_SUBCOMMAND)
                 .about("Extracts the archive into the directory")
                 .arg(
-                    Arg::with_name(ARCHIVE_ARG_NAME)
+                    Arg::new(ARCHIVE_ARG_NAME)
                         .required(true)
                         .takes_value(true)
                         .help("An archive to extract"),
                 )
                 .arg(
-                    Arg::with_name(TARGET_DIRECTORY_ARG_NAME)
+                    Arg::new(TARGET_DIRECTORY_ARG_NAME)
                         .required(false)
                         .takes_value(true)
                         .help("A directory to extract the archive into. Optional, will use the current directory if not specified"),
                 ),
-            SubCommand::with_name(CREATE_SUBCOMMAND)
+            App::new(CREATE_SUBCOMMAND)
                 .about("Creates an archive with the contents of a directory (only the first level files are taken, metadata file has to be present in the same directory)")
                 .arg(
-                    Arg::with_name(SOURCE_DIRECTORY_ARG_NAME)
+                    Arg::new(SOURCE_DIRECTORY_ARG_NAME)
                         .required(true)
                         .takes_value(true)
                         .help("A directory to use for creating the archive"),
                 )
                 .arg(
-                    Arg::with_name(TARGET_DIRECTORY_ARG_NAME)
+                    Arg::new(TARGET_DIRECTORY_ARG_NAME)
                         .required(false)
                         .takes_value(true)
                         .help("A directory to create the archive in. Optional, will use the current directory if not specified"),

pageserver/src/bin/update_metadata.rs

@@ -14,20 +14,20 @@ fn main() -> Result<()> {
         .about("Dump or update metadata file")
         .version(GIT_VERSION)
         .arg(
-            Arg::with_name("path")
+            Arg::new("path")
                 .help("Path to metadata file")
                 .required(true),
         )
         .arg(
-            Arg::with_name("disk_lsn")
-                .short("d")
+            Arg::new("disk_lsn")
+                .short('d')
                 .long("disk_lsn")
                 .takes_value(true)
                 .help("Replace disk constistent lsn"),
         )
         .arg(
-            Arg::with_name("prev_lsn")
-                .short("p")
+            Arg::new("prev_lsn")
+                .short('p')
                 .long("prev_lsn")
                 .takes_value(true)
                 .help("Previous record LSN"),

pageserver/src/walreceiver.rs

@@ -13,13 +13,13 @@ use crate::walingest::WalIngest;
 use anyhow::{bail, Context, Error, Result};
 use bytes::BytesMut;
 use lazy_static::lazy_static;
-use parking_lot::Mutex;
 use postgres_ffi::waldecoder::*;
 use postgres_protocol::message::backend::ReplicationMessage;
 use postgres_types::PgLsn;
 use std::cell::Cell;
 use std::collections::HashMap;
 use std::str::FromStr;
+use std::sync::Mutex;
 use std::thread_local;
 use std::time::SystemTime;
 use tokio::pin;
@@ -51,7 +51,7 @@ thread_local! {
 }
 
 fn drop_wal_receiver(tenantid: ZTenantId, timelineid: ZTimelineId) {
-    let mut receivers = WAL_RECEIVERS.lock();
+    let mut receivers = WAL_RECEIVERS.lock().unwrap();
     receivers.remove(&(tenantid, timelineid));
 }
 
@@ -62,7 +62,7 @@ pub fn launch_wal_receiver(
     timelineid: ZTimelineId,
     wal_producer_connstr: &str,
 ) -> Result<()> {
-    let mut receivers = WAL_RECEIVERS.lock();
+    let mut receivers = WAL_RECEIVERS.lock().unwrap();
 
     match receivers.get_mut(&(tenantid, timelineid)) {
         Some(receiver) => {
@@ -95,7 +95,7 @@ pub fn launch_wal_receiver(
 
 // Look up current WAL producer connection string in the hash table
 fn get_wal_producer_connstr(tenantid: ZTenantId, timelineid: ZTimelineId) -> String {
-    let receivers = WAL_RECEIVERS.lock();
+    let receivers = WAL_RECEIVERS.lock().unwrap();
 
     receivers
         .get(&(tenantid, timelineid))