Skip to content

feat(pg_upgrade): use self-hosted nix installer if available; move files out of /tmp #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 13, 2024
Merged

feat(pg_upgrade): use self-hosted nix installer if available; move files out of /tmp #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba5db1c
feat(pg_upgrade): use self-hosted nix installer if available
pcnc Sep 11, 2024
d3a63c2
chore: run post-upgrade vacuum_db as superuser
pcnc Sep 11, 2024
ed63ed7
chore: more fix
pcnc Sep 11, 2024
497f6e8
chore: revert changes
pcnc Sep 13, 2024
fd5e397
Merge remote-tracking branch 'origin/develop' into pcnc/pinned-nix-in…
pcnc Sep 13, 2024
c4fefaa
Merge remote-tracking branch 'origin/develop' into pcnc/pinned-nix-in…
pcnc Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ansible/files/admin_api_scripts/pg_upgrade_scripts/complete.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,13 @@ function apply_auth_scheme_updates {

function start_vacuum_analyze {
echo "complete" > /tmp/pg-upgrade-status
if ! command -v nix &> /dev/null; then
su -c 'vacuumdb --all --analyze-in-stages' -s "$SHELL" postgres
else
su -c '. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && vacuumdb --all --analyze-in-stages' -s "$SHELL" postgres

# shellcheck disable=SC1091
if [ -f "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh" ]; then
# shellcheck disable=SC1091
source "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh"
fi
vacuumdb --all --analyze-in-stages -U supabase_admin -h localhost -p 5432
echo "Upgrade job completed"
}

Expand Down
17 changes: 14 additions & 3 deletions ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ PGBINOLD="/usr/lib/postgresql/bin"
PGLIBOLD="/usr/lib/postgresql/lib"

PG_UPGRADE_BIN_DIR="/tmp/pg_upgrade_bin/$PGVERSION"
NIX_INSTALLER_PATH="/tmp/persistent/nix-installer"
NIX_INSTALLER_PACKAGE_PATH="$NIX_INSTALLER_PATH.tar.gz"

if [ -L "$PGBINOLD/pg_upgrade" ]; then
BINARY_PATH=$(readlink -f "$PGBINOLD/pg_upgrade")
Expand Down Expand Up @@ -286,9 +288,18 @@ function initiate_upgrade {
if ! command -v nix > /dev/null; then
echo "1.1. Nix is not installed; installing."

curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install --no-confirm \
--extra-conf "substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com" \
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
if [ -f "$NIX_INSTALLER_PACKAGE_PATH" ]; then
echo "1.1.1. Installing Nix using the provided installer"
tar -xzf "$NIX_INSTALLER_PACKAGE_PATH" -C /tmp/persistent/
chmod +x "$NIX_INSTALLER_PATH"
"$NIX_INSTALLER_PATH" install --no-confirm
else
echo "1.1.1. Installing Nix using the official installer"

curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install --no-confirm \
--extra-conf "substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com" \
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
fi
else
echo "1.1. Nix is installed; moving on."
fi
Expand Down
Loading