rm

compute/compute-node.Dockerfile

@@ -1527,51 +1527,6 @@ COPY --from=pgauditlogtofile-src /ext-src/ /ext-src/
 WORKDIR /ext-src/pgauditlogtofile-src
 RUN make install USE_PGXS=1 -j $(getconf _NPROCESSORS_ONLN)
 
-#########################################################################################
-#
-# Layer "pg_rest-build"
-# compile pg_rest extension
-#
-#########################################################################################
-FROM build-deps AS pg_rest-src
-ARG PG_VERSION
-ARG PG_REST_VERSION=3.0.1
-
-# Only supported for PostgreSQL v17
-RUN if [ "${PG_VERSION:?}" != "v17" ]; then \
-        echo "pg_rest extension is only supported for PostgreSQL v17" && exit 0; \
-    fi
-
-WORKDIR /ext-src
-RUN mkdir -p pg_rest-src && cd pg_rest-src && \
-    wget https://github.com/ruslantalpa/foxfirebase/raw/main/pg_rest_pg17-${PG_REST_VERSION}_neon-debian-bookworm_aarch64.deb -O pg_rest_pg17-${PG_REST_VERSION}_aarch64.deb && \
-    wget https://github.com/ruslantalpa/foxfirebase/raw/main/pg_rest_pg17-${PG_REST_VERSION}_neon-debian-bookworm_amd64.deb -O pg_rest_pg17-${PG_REST_VERSION}_amd64.deb
-
-FROM pg-build AS pg_rest-build
-ARG PG_REST_VERSION=3.0.1
-ARG PG_VERSION
-COPY --from=pg_rest-src /ext-src/ /ext-src/
-WORKDIR /ext-src/pg_rest-src
-RUN if [ "${PG_VERSION:?}" = "v17" ]; then \
-        export ARCH=$(uname -m) && \
-        echo "ARCH: $ARCH" && \
-        # Map architecture names to package names
-        if [ "$ARCH" = "x86_64" ]; then \
-            PACKAGE_ARCH="amd64"; \
-        else \
-            PACKAGE_ARCH="$ARCH"; \
-        fi && \
-        echo "Using package architecture: $PACKAGE_ARCH" && \
-        apt-get update && \
-        apt-get install -y ./pg_rest_pg17-${PG_REST_VERSION}_${PACKAGE_ARCH}.deb && \
-        sed -i 's/superuser = false/superuser = true/g' /usr/local/pgsql/share/extension/pg_rest.control && \
-        echo 'trusted = true' >> /usr/local/pgsql/share/extension/pg_rest.control && \
-        # Clean up
-        apt-get clean && rm -rf /var/lib/apt/lists/*; \
-    else \
-        echo "pg_rest extension is only supported for PostgreSQL v17, skipping build"; \
-    fi
-
 #########################################################################################
 #
 # Layer "neon-ext-build"
@@ -1667,7 +1622,6 @@ COPY --from=pg_duckdb-build /usr/local/pgsql/ /usr/local/pgsql/
 COPY --from=pg_repack-build /usr/local/pgsql/ /usr/local/pgsql/
 COPY --from=pgaudit-build /usr/local/pgsql/ /usr/local/pgsql/
 COPY --from=pgauditlogtofile-build /usr/local/pgsql/ /usr/local/pgsql/
-COPY --from=pg_rest-build /usr/local/pgsql/ /usr/local/pgsql/
 
 #########################################################################################
 #
@@ -1844,6 +1798,7 @@ COPY --from=pg_repack-src /ext-src/ /ext-src/
 COPY --from=pg_repack-build /usr/local/pgsql/ /usr/local/pgsql/
 COPY compute/patches/pg_repack.patch /ext-src
 RUN cd /ext-src/pg_repack-src && patch -p1 </ext-src/pg_repack.patch && rm -f /ext-src/pg_repack.patch
+
 COPY --chmod=755 docker-compose/run-tests.sh /run-tests.sh
 RUN apt-get update && apt-get install -y libtap-parser-sourcehandler-pgtap-perl\
    && apt clean && rm -rf /ext-src/*.tar.gz /var/lib/apt/lists/*
@@ -1976,4 +1931,3 @@ RUN mkdir /var/run/rsyslogd && \
 ENV LANG=en_US.utf8
 USER postgres
 ENTRYPOINT ["/usr/local/bin/compute_ctl"]
-

pageserver/src/tenant/timeline/compaction.rs

@@ -1244,10 +1244,6 @@ impl Timeline {
         let mut replace_image_layers = Vec::new();
 
         for layer in layers_to_rewrite {
-            if self.cancel.is_cancelled() {
-                return Err(CompactionError::ShuttingDown);
-            }
-
             tracing::info!(layer=%layer, "Rewriting layer after shard split...");
             let mut image_layer_writer = ImageLayerWriter::new(
                 self.conf,

pgxn/neon/pagestore_smgr.c

@@ -1900,6 +1900,7 @@ neon_wallog_pagev(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 		log_pages = true;
 	}
 	else if (XLogInsertAllowed() &&
+			 !ShutdownRequestPending &&
 			 (forknum == FSM_FORKNUM || forknum == VISIBILITYMAP_FORKNUM))
 	{
 		log_pages = true;

safekeeper/src/bin/safekeeper.rs

@@ -223,9 +223,6 @@ struct Args {
     /// Flag to use https for requests to peer's safekeeper API.
     #[arg(long)]
     pub use_https_safekeeper_api: bool,
-    /// Path to the JWT auth token used to authenticate with other safekeepers.
-    #[arg(long)]
-    auth_token_path: Option<Utf8PathBuf>,
 }
 
 // Like PathBufValueParser, but allows empty string.
@@ -344,24 +341,14 @@ async fn main() -> anyhow::Result<()> {
     };
 
     // Load JWT auth token to connect to other safekeepers for pull_timeline.
-    // First check if the env var is present, then check the arg with the path.
-    // We want to deprecate and remove the env var method in the future.
     let sk_auth_token = match var("SAFEKEEPER_AUTH_TOKEN") {
         Ok(v) => {
             info!("loaded JWT token for authentication with safekeepers");
             Some(SecretString::from(v))
         }
         Err(VarError::NotPresent) => {
-            if let Some(auth_token_path) = args.auth_token_path.as_ref() {
-                info!(
-                    "loading JWT token for authentication with safekeepers from {auth_token_path}"
-                );
-                let auth_token = tokio::fs::read_to_string(auth_token_path).await?;
-                Some(SecretString::from(auth_token.trim().to_owned()))
-            } else {
-                info!("no JWT token for authentication with safekeepers detected");
-                None
-            }
+            info!("no JWT token for authentication with safekeepers detected");
+            None
         }
         Err(_) => {
             warn!("JWT token for authentication with safekeepers is not unicode");

test_runner/regress/test_storage_controller.py

@@ -4109,7 +4109,6 @@ def test_storcon_create_delete_sk_down(neon_env_builder: NeonEnvBuilder, restart
     env.storage_controller.allowed_errors.extend(
         [
             ".*Call to safekeeper.* management API still failed after.*",
-            ".*Call to safekeeper.* management API failed, will retry.*",
             ".*reconcile_one.*tenant_id={tenant_id}.*Call to safekeeper.* management API still failed after.*",
         ]
     )

test_runner/regress/test_wal_acceptor.py

@@ -488,14 +488,13 @@ def test_wal_backup(neon_env_builder: NeonEnvBuilder):
     assert_prefix_empty(neon_env_builder.safekeepers_remote_storage, prefix)
 
 
-# This test is flaky, probably because PUTs of local fs storage are not atomic.
-# Let's keep both remote storage kinds for a while to see if this is the case.
-# https://github.com/neondatabase/neon/issues/10761
-@pytest.mark.parametrize("remote_storage_kind", [s3_storage(), RemoteStorageKind.LOCAL_FS])
-def test_s3_wal_replay(neon_env_builder: NeonEnvBuilder, remote_storage_kind: RemoteStorageKind):
+def test_s3_wal_replay(neon_env_builder: NeonEnvBuilder):
     neon_env_builder.num_safekeepers = 3
 
-    neon_env_builder.enable_safekeeper_remote_storage(remote_storage_kind)
+    # Note: local fs implementation is not protected from concurrent uploads of
+    # the same segment by different safekeepers and makes the test flaky.
+    # https://github.com/neondatabase/neon/issues/10761
+    neon_env_builder.enable_safekeeper_remote_storage(s3_storage())
 
     env = neon_env_builder.init_start()
     tenant_id = env.initial_tenant

vendor/revisions.json

@@ -1,18 +1,18 @@
 {
   "v17": [
     "17.4",
-    "66114c23bc61205b0e3fb1e77ee76a4abc1eb4b8"
+    "c9e4ff5a38907acd71107634055bf2609aba43a5"
   ],
   "v16": [
     "16.8",
-    "d56e79cd5d6136c159b1d8d98acb7981d4b69364"
+    "746bd9ffe5c29bce030eaea1031054057f3c5d45"
   ],
   "v15": [
     "15.12",
-    "aeb292eeace9072e07071254b6ffc7a74007d4d2"
+    "23708b3aca9adf163aa0973eb63d9afc0e4a04c3"
   ],
   "v14": [
     "14.17",
-    "a0391901a2af13aa029b905272a5b2024133c926"
+    "8cca70c22e2894dd4645f9a940086ac437b0a11b"
   ]
 }