feat: multi-ext-versions-pgrcron

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

@@ -108,13 +108,13 @@ jobs:
           df -h /  # Display available space
 
       - name: Run tests
-        timeout-minutes: 10
+        timeout-minutes: 30
         env:
           AMI_NAME: "supabase-postgres-${{ steps.random.outputs.random_string }}"
         run: |
           # TODO: use poetry for pkg mgmt
           pip3 install boto3 boto3-stubs[essential] docker ec2instanceconnectcli pytest pytest-testinfra[paramiko,docker] requests
-          pytest -vv -s testinfra/test_ami_nix.py 
+          pytest -vvvv -s testinfra/test_ami_nix.py
 
       - name: Cleanup resources on build cancellation
         if: ${{ cancelled() }}

ansible/files/postgres_prestart.sh.j2

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+set -x  # Print commands
+
+log() {
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1"
+}
+
 check_orioledb_enabled() {
    local pg_conf="/etc/postgresql/postgresql.conf"
    if [ ! -f "$pg_conf" ]; then
@@ -26,7 +32,78 @@ update_orioledb_buffers() {
    fi
 }
 
+check_extensions_file() {
+    local extensions_file="/etc/adminapi/pg-extensions.json"
+    if [ ! -f "$extensions_file" ]; then
+        log "extensions: No extensions file found, skipping extensions versions check"
+        return 1
+    fi
+    if [ ! -r "$extensions_file" ]; then
+        log "extensions: Cannot read extensions file"
+        return 1
+    fi
+    return 0
+}
+
+get_pg_cron_version() {
+    if ! check_extensions_file; then
+        return
+    fi
+
+    local version
+    version=$(jq -r '.pg_cron // empty' "/etc/adminapi/pg-extensions.json")
+    if [ -z "$version" ]; then
+        log "pg_cron: Not specified in extensions file"
+        return
+    fi
+
+    if ! [[ "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+        log "pg_cron: Invalid version format: $version"
+        return
+    fi
+
+    # Log the version but don't include it in the output
+    log "pg_cron: Found version $version in extensions file" >&2
+    printf "%s" "$version"
+}
+
+switch_pg_cron_version() {
+    local version="$1"
+    local switch_script="/var/lib/postgresql/.nix-profile/bin/switch_pg_cron_version"
+
+    if [ ! -x "$switch_script" ]; then
+        log "pg_cron: No version switch script available at $switch_script"
+        return 1
+    fi
+
+    log "pg_cron: Switching to version $version"
+    # Run directly as root since we're already running as root
+    "$switch_script" "$version"
+    local exit_code=$?
+    if [ $exit_code -eq 0 ]; then
+        log "pg_cron: Version switch completed successfully"
+    else
+        log "pg_cron: Version switch failed with exit code $exit_code"
+    fi
+    return $exit_code
+}
+
+handle_pg_cron_version() {
+    local version
+    version=$(get_pg_cron_version)
+    if [ -n "$version" ]; then
+        # Don't fail if version switch fails
+        switch_pg_cron_version "$version" || log "pg_cron: Version switch failed but continuing"
+    fi
+}
+
 main() {
+   log "Starting prestart script"
+
+   # 1. pg_cron version handling 
+   handle_pg_cron_version
+
+   # 2. orioledb handling 
    local has_orioledb=$(check_orioledb_enabled)
    if [ "$has_orioledb" -lt 1 ]; then
        return 0
@@ -35,6 +112,8 @@ main() {
    if [ ! -z "$shared_buffers_value" ]; then
        update_orioledb_buffers "$shared_buffers_value"
    fi
+
+   log "Prestart script completed"
 }
 
 # Initial locale setup

ansible/files/postgresql_config/postgresql.service.j2

@@ -18,6 +18,8 @@ TimeoutStopSec=90
 TimeoutStartSec=86400
 Restart=always
 RestartSec=5
+StandardOutput=journal
+StandardError=journal
 OOMScoreAdjust=-1000
 EnvironmentFile=-/etc/environment.d/postgresql.env
 LimitNOFILE=16384

ansible/tasks/stage2-setup-postgres.yml

@@ -94,6 +94,12 @@
   shell: |
     sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#{{postgresql_version}}_src"
   when: stage2_nix
+
+- name: Install jq from nix binary cache
+  become: yes
+  shell: |
+    . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install nixpkgs#jq --profile /nix/var/nix/profiles/default
+  when: stage2_nix
 
 - name: Set ownership and permissions for /etc/ssl/private
   become: yes

ansible/vars.yml

@@ -9,9 +9,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.0.1.086-orioledb"
-  postgres17: "17.4.1.036"
-  postgres15: "15.8.1.093"
+  postgresorioledb-17: "17.0.1.086-orioledb-cron-1"
+  postgres17: "17.4.1.036-cron-1"
+  postgres15: "15.8.1.093-cron-1"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"