Merge branch 'develop' into pg17_7

Author: hunleyd

.github/workflows/testinfra-ami-build.yml

@@ -109,12 +109,18 @@ jobs:
           echo "" >> common-nix.vars.pkr.hcl
 
       - name: Build AMI stage 1
+        env:
+          AWS_MAX_ATTEMPTS: 10
+          AWS_RETRY_MODE: adaptive
         run: |
           GIT_SHA=${{github.sha}}
           nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl
           nix run github:supabase/postgres/${GIT_SHA}#packer -- build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${EXECUTION_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
 
       - name: Build AMI stage 2
+        env:
+          AWS_MAX_ATTEMPTS: 10
+          AWS_RETRY_MODE: adaptive
         run: |
           GIT_SHA=${{github.sha}}
           nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl

Dockerfile-orioledb-17

@@ -204,11 +204,17 @@ RUN sed -i \
     # Remove items from postgresql.conf
 RUN sed -i 's/ timescaledb,//g;' "/etc/postgresql/postgresql.conf" 
     #as of pg 16.4 + this db_user_namespace totally deprecated and will break the server if setting is present
-RUN sed -i 's/db_user_namespace = off/#db_user_namespace = off/g;' "/etc/postgresql/postgresql.conf" 
-RUN sed -i 's/ timescaledb,//g; s/ plv8,//g; s/ postgis,//g; s/ pgrouting,//g' "/etc/postgresql-custom/supautils.conf" 
-RUN sed -i 's/\(shared_preload_libraries.*\)'\''\(.*\)$/\1, orioledb'\''\2/' "/etc/postgresql/postgresql.conf" 
-RUN echo "default_table_access_method = 'orioledb'" >> "/etc/postgresql/postgresql.conf" 
-
+RUN sed -i 's/ timescaledb,//g; s/ plv8,//g; s/ postgis,//g; s/ pgrouting,//g' "/etc/postgresql-custom/supautils.conf"
+RUN sed -i 's/\(shared_preload_libraries.*\)'\''\(.*\)$/\1, orioledb'\''\2/' "/etc/postgresql/postgresql.conf"
+RUN echo "default_table_access_method = 'orioledb'" >> "/etc/postgresql/postgresql.conf"
+
+# OrioleDB rewind configuration
+# Enables time-based rewind capability for up to 20 minutes (1200 seconds)
+# Buffer size: 1280 buffers * 8KB = 10MB for transaction retention
+RUN echo "orioledb.enable_rewind = true" >> "/etc/postgresql/postgresql.conf" && \
+    echo "orioledb.rewind_max_time = 1200" >> "/etc/postgresql/postgresql.conf" && \
+    echo "orioledb.rewind_max_transactions = 100000" >> "/etc/postgresql/postgresql.conf" && \
+    echo "orioledb.rewind_buffers = 1280" >> "/etc/postgresql/postgresql.conf" 
 
 
 # # Include schema migrations

amazon-arm64-nix.pkr.hcl

@@ -115,6 +115,12 @@ source "amazon-ebssurrogate" "source" {
   #secret_key   = "${var.aws_secret_key}"
   force_deregister = var.force-deregister
 
+  # Increase timeout for instance stop operations to handle large instances
+  aws_polling {
+    delay_seconds = 15
+    max_attempts  = 120  # 120 * 15s = 30 minutes max wait
+  }
+
   # Use latest official ubuntu noble ami owned by Canonical.
   source_ami_filter {
     filters = {

ansible/tasks/stage2-setup-postgres.yml

@@ -51,6 +51,38 @@
             line: "default_table_access_method = 'orioledb'"
             path: '/etc/postgresql/postgresql.conf'
             state: 'present'
+
+        - name: Enable OrioleDB rewind feature
+          ansible.builtin.lineinfile:
+            path: /etc/postgresql/postgresql.conf
+            line: "orioledb.enable_rewind = true"
+            state: present
+          when: is_psql_oriole and stage2_nix
+          become: yes
+
+        - name: Set OrioleDB rewind max time (20 minutes)
+          ansible.builtin.lineinfile:
+            path: /etc/postgresql/postgresql.conf
+            line: "orioledb.rewind_max_time = 1200"
+            state: present
+          when: is_psql_oriole and stage2_nix
+          become: yes
+
+        - name: Set OrioleDB rewind max transactions
+          ansible.builtin.lineinfile:
+            path: /etc/postgresql/postgresql.conf
+            line: "orioledb.rewind_max_transactions = 100000"
+            state: present
+          when: is_psql_oriole and stage2_nix
+          become: yes
+
+        - name: Set OrioleDB rewind buffers (1280 buffers = 10MB)
+          ansible.builtin.lineinfile:
+            path: /etc/postgresql/postgresql.conf
+            line: "orioledb.rewind_buffers = 1280"
+            state: present
+          when: is_psql_oriole and stage2_nix
+          become: yes
 
         - name: Add ORIOLEDB_ENABLED environment variable
           ansible.builtin.lineinfile:

ansible/vars.yml

@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.5.1.073-orioledb"
   postgres17: "17.7.1.001"
-  postgres15: "15.14.1.052"
+  postgresorioledb-17: "17.6.0.010-orioledb"
+  postgres15: "15.14.1.053"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.19.0

migrations/schema-orioledb-17.sql

@@ -2,8 +2,10 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.5
--- Dumped by pg_dump version 17.5
+\restrict SupabaseTestDumpKey123
+
+-- Dumped from database version 17.6
+-- Dumped by pg_dump version 17.6
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -1012,3 +1014,5 @@ CREATE EVENT TRIGGER pgrst_drop_watch ON sql_drop
 -- PostgreSQL database dump complete
 --
 
+\unrestrict SupabaseTestDumpKey123
+