From f19dcbffa770188181e0a1286e17a6979edd9cc4 Mon Sep 17 00:00:00 2001 From: Div Arora Date: Thu, 3 Apr 2025 11:40:42 +0800 Subject: [PATCH 1/2] fix: skip installing ndisc issue resolver in qemu mode The issue was caused by very frequent RAs in ec2 when operating in IPv6 mode. The qemu artifact gets configured with a static IP instead, so this service should no longer be needed. Additionally, fixes the build process to correctly define qemu_mode for both ansible calls. --- ansible/playbook.yml | 2 +- ansible/vars.yml | 6 +++--- ebssurrogate/scripts/qemu-bootstrap-nix.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/playbook.yml b/ansible/playbook.yml index 5c8a9f70e..806079aa9 100644 --- a/ansible/playbook.yml +++ b/ansible/playbook.yml @@ -82,7 +82,7 @@ import_tasks: tasks/fix_ipv6_ndisc.yml tags: - install-supabase-internal - when: debpkg_mode or nixpkg_mode + when: (debpkg_mode or nixpkg_mode) and (qemu_mode is undefined) - name: Start Postgres Database without Systemd become: yes diff --git a/ansible/vars.yml b/ansible/vars.yml index 68a82dc5b..a246c866e 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -9,9 +9,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.0.1.57-orioledb" - postgres17: "17.4.1.007" - postgres15: "15.8.1.064" + postgresorioledb-17: "17.0.1.58-orioledb" + postgres17: "17.4.1.008" + postgres15: "15.8.1.065" # Non Postgres Extensions pgbouncer_release: "1.19.0" diff --git a/ebssurrogate/scripts/qemu-bootstrap-nix.sh b/ebssurrogate/scripts/qemu-bootstrap-nix.sh index 9fe35fa90..ad5c2744c 100755 --- a/ebssurrogate/scripts/qemu-bootstrap-nix.sh +++ b/ebssurrogate/scripts/qemu-bootstrap-nix.sh @@ -35,7 +35,7 @@ callbacks_enabled = timer, profile_tasks, profile_roles EOF # Run Ansible playbook export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/mnt/tmp - ansible-playbook ./ansible/playbook.yml --extra-vars '{"nixpkg_mode": true, "debpkg_mode": false, "stage2_nix": false}' \ + ansible-playbook ./ansible/playbook.yml --extra-vars '{"nixpkg_mode": true, "debpkg_mode": false, "stage2_nix": false, "qemu_mode": true}' \ --extra-vars "postgresql_version=postgresql_${POSTGRES_MAJOR_VERSION}" \ --extra-vars "postgresql_major_version=${POSTGRES_MAJOR_VERSION}" \ --extra-vars "postgresql_major=${POSTGRES_MAJOR_VERSION}" \ From 809cfa0c2fc6f1e43a4f9acd7ff3bd29f4b6a9ca Mon Sep 17 00:00:00 2001 From: Div Arora Date: Thu, 3 Apr 2025 11:49:38 +0800 Subject: [PATCH 2/2] fix: update adminapi service for qemu builds --- ansible/files/adminapi.service.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/files/adminapi.service.j2 b/ansible/files/adminapi.service.j2 index 6078f3d1a..3b2821984 100644 --- a/ansible/files/adminapi.service.j2 +++ b/ansible/files/adminapi.service.j2 @@ -8,6 +8,9 @@ User=adminapi Restart=always RestartSec=3 Environment="AWS_USE_DUALSTACK_ENDPOINT=true" +{% if qemu_mode is defined and qemu_mode %} +Environment="AWS_SDK_LOAD_CONFIG=true" +{% endif %} [Install] WantedBy=multi-user.target