Do not import AUX files while initializing fresh timeline from pgdatadir

Author: Konstantin Knizhnik

pageserver/src/import_datadir.rs

@@ -76,7 +76,7 @@ pub async fn import_timeline_from_postgres_datadir(
             let mut file = tokio::fs::File::open(absolute_path).await?;
             let len = metadata.len() as usize;
             if let Some(control_file) =
-                import_file(&mut modification, relative_path, &mut file, len, ctx).await?
+                import_file(&mut modification, relative_path, &mut file, len, false, ctx).await?
             {
                 pg_control = Some(control_file);
             }
@@ -364,8 +364,15 @@ pub async fn import_basebackup_from_tar(
 
         match header.entry_type() {
             tokio_tar::EntryType::Regular => {
-                if let Some(res) =
-                    import_file(&mut modification, file_path.as_ref(), &mut entry, len, ctx).await?
+                if let Some(res) = import_file(
+                    &mut modification,
+                    file_path.as_ref(),
+                    &mut entry,
+                    len,
+                    true,
+                    ctx,
+                )
+                .await?
                 {
                     // We found the pg_control file.
                     pg_control = Some(res);
@@ -489,6 +496,7 @@ async fn import_file(
     file_path: &Path,
     reader: &mut (impl AsyncRead + Send + Sync + Unpin),
     len: usize,
+    import_aux_files: bool,
     ctx: &RequestContext,
 ) -> Result<Option<ControlFileData>> {
     let file_name = match file_path.file_name() {
@@ -614,9 +622,10 @@ async fn import_file(
         // TODO Backups exported from neon won't have pg_tblspc, but we will need
         // this to import arbitrary postgres databases.
         bail!("Importing pg_tblspc is not implemented");
-    } else if file_path.starts_with("pg_logical/")
-        || file_path.starts_with("pg_replslot/")
-        || file_path.starts_with("pg_stat/")
+    } else if import_aux_files
+        && (file_path.starts_with("pg_logical/")
+            || file_path.starts_with("pg_replslot/")
+            || file_path.starts_with("pg_stat/"))
     {
         let bytes = read_all_bytes(reader).await?;
         modification

vendor/postgres-v15

@@ -1,5 +1,5 @@
 {
-  "v16": ["16.3", "9901875cd3a4b80709653998544215323e13ef2f"],
-  "v15": ["15.7", "c421378a31ea74c0530e6e0f41af51498913a49b"],
+  "v16": ["16.3", "d55e0aca104af0b611cf5565f1033b2acd2dcc1c"],
+  "v15": ["15.7", "0640e6b24a7eb2b626a7432c0e2801840954429e"],
   "v14": ["14.12", "7845c122d51d3ebb547a984a640ac0310a2fadce"]
 }