build(deps): bump openssl from 0.10.55 to 0.10.60

Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.55 to 0.10.60.
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.55...openssl-v0.10.60)

---
updated-dependencies:
- dependency-name: openssl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Cargo.lock

@@ -651,7 +651,7 @@ dependencies = [
  "async-trait",
  "axum-core",
  "base64 0.21.1",
- "bitflags",
+ "bitflags 1.3.2",
  "bytes",
  "futures-util",
  "http",
@@ -848,7 +848,7 @@ version = "0.65.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cexpr",
  "clang-sys",
  "lazy_static",
@@ -871,6 +871,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -1054,7 +1060,7 @@ checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
 dependencies = [
  "anstream",
  "anstyle",
- "bitflags",
+ "bitflags 1.3.2",
  "clap_lex",
  "strsim",
 ]
@@ -1376,7 +1382,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crossterm_winapi",
  "libc",
  "mio",
@@ -2236,7 +2242,7 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "inotify-sys",
  "libc",
 ]
@@ -2247,7 +2253,7 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "futures-core",
  "inotify-sys",
  "libc",
@@ -2367,7 +2373,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "libc",
 ]
 
@@ -2581,7 +2587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
 dependencies = [
  "autocfg",
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
 ]
@@ -2592,7 +2598,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "memoffset 0.7.1",
@@ -2616,7 +2622,7 @@ version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
@@ -2737,11 +2743,11 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "openssl"
-version = "0.10.55"
+version = "0.10.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
+checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2769,9 +2775,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.90"
+version = "0.9.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
+checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f"
 dependencies = [
  "cc",
  "libc",
@@ -3396,7 +3402,7 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "byteorder",
  "hex",
  "lazy_static",
@@ -3678,7 +3684,7 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -3687,7 +3693,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -3981,7 +3987,7 @@ version = "0.36.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
@@ -3995,7 +4001,7 @@ version = "0.37.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
@@ -4208,7 +4214,7 @@ version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",

pageserver/src/pgdatadir_mapping.rs

@@ -205,77 +205,6 @@ impl Timeline {
         Ok(total_blocks)
     }
 
-    pub async fn get_rel_size_if_exists(
-        &self,
-        tag: RelTag,
-        lsn: Lsn,
-        latest: bool,
-        ctx: &RequestContext,
-    ) -> Result<Option<BlockNumber>, PageReconstructError> {
-        if tag.relnode == 0 {
-            return Err(PageReconstructError::Other(
-                RelationError::InvalidRelnode.into(),
-            ));
-        }
-
-        // NOTE there exist helper functions for this but we inline it all
-        //      so we can do the work without acquiring lock more than once
-        //      and searching the hashmap more than once. This is a performance
-        //      critical path.
-        // TODO we could get away with read lock if latest != false. But latest
-        //      is not known at compile time so this work requires some rust type
-        //      acrobatics to do. For now it's fine because we only call this
-        //      with latest = true.
-        let mut rel_size_cache = self.rel_size_cache.write().unwrap();
-
-        match rel_size_cache.entry(tag) {
-            hash_map::Entry::Occupied(entry) => {
-                return Ok(Some(entry.get().1));
-            }
-            hash_map::Entry::Vacant(entry) => {
-                let exists = {
-                    let key = rel_dir_to_key(tag.spcnode, tag.dbnode);
-                    let buf = self.get(key, lsn, ctx).await?;
-                    match RelDirectory::des(&buf).context("deserialization failure") {
-                        Ok(dir) => dir.rels.get(&(tag.relnode, tag.forknum)).is_some(),
-                        Err(e) => return Err(PageReconstructError::from(e)),
-                    }
-                };
-
-                // Return early if not exists
-                if !exists {
-                    if tag.forknum == FSM_FORKNUM || tag.forknum == VISIBILITYMAP_FORKNUM {
-                        // FIXME: Postgres sometimes calls smgrcreate() to create
-                        // FSM, and smgrnblocks() on it immediately afterwards,
-                        // without extending it.  Tolerate that by claiming that
-                        // any non-existent FSM fork has size 0.
-                        return Ok(Some(0));
-                    } else {
-                        return Ok(None);
-                    }
-                }
-
-                // Get size from repo
-                let key = rel_size_to_key(tag);
-                let mut buf = self.get(key, lsn, ctx).await?;
-                let nblocks = buf.get_u32_le();
-
-                if latest {
-                    // Update relation size cache only if "latest" flag is set.
-                    // This flag is set by compute when it is working with most recent version of relation.
-                    // Typically master compute node always set latest=true.
-                    // Please notice, that even if compute node "by mistake" specifies old LSN but set
-                    // latest=true, then it can not cause cache corruption, because with latest=true
-                    // pageserver choose max(request_lsn, last_written_lsn) and so cached value will be
-                    // associated with most recent value of LSN.
-                    entry.insert((lsn, nblocks));
-                }
-
-                Ok(Some(nblocks))
-            }
-        }
-    }
-
     /// Get size of a relation file
     pub async fn get_rel_size(
         &self,

pageserver/src/walingest.rs

@@ -1440,20 +1440,19 @@ impl<'a> WalIngest<'a> {
         // record.
         // TODO: would be nice if to be more explicit about it
         let last_lsn = modification.lsn;
-        let old_nblocks = match self
+        let old_nblocks = if !self
             .timeline
-            .get_rel_size_if_exists(rel, last_lsn, true, ctx)
+            .get_rel_exists(rel, last_lsn, true, ctx)
             .await?
         {
-            Some(nblocks) => nblocks,
-            None => {
-                // create it with 0 size initially, the logic below will extend it
-                modification
-                    .put_rel_creation(rel, 0, ctx)
-                    .await
-                    .context("Relation Error")?;
-                0
-            }
+            // create it with 0 size initially, the logic below will extend it
+            modification
+                .put_rel_creation(rel, 0, ctx)
+                .await
+                .context("Relation Error")?;
+            0
+        } else {
+            self.timeline.get_rel_size(rel, last_lsn, true, ctx).await?
         };
 
         if new_nblocks > old_nblocks {
@@ -2151,11 +2150,9 @@ mod tests {
 
         // Decode and ingest wal. We process the wal in chunks because
         // that's what happens when we get bytes from safekeepers.
-        let mut n_records = 0;
         for chunk in bytes[xlogoff..].chunks(50) {
             decoder.feed_bytes(chunk);
             while let Some((lsn, recdata)) = decoder.poll_decode().unwrap() {
-                n_records += 1;
                 walingest
                     .ingest_record(recdata, lsn, &mut modification, &mut decoded, &ctx)
                     .await
@@ -2164,6 +2161,6 @@ mod tests {
         }
 
         let duration = started_at.elapsed();
-        println!("ingested {} records in {:?}", n_records, duration);
+        println!("done in {:?}", duration);
     }
 }