Merge branch 'release/15.6' into fix/reserved-memberships

Author: soedirgo

ansible/files/admin_api_scripts/pg_upgrade_scripts/common.sh

@@ -541,16 +541,6 @@ $$;
 
 alter database postgres connection limit -1;
 
--- #incident-2024-09-12-project-upgrades-are-temporarily-disabled
-do $$
-begin
-  if exists (select from pg_authid where rolname = 'pg_read_all_data') then
-    execute('grant pg_read_all_data to postgres');
-  end if;
-end
-$$;
-grant pg_signal_backend to postgres;
-
 set session authorization supabase_admin;
 drop role supabase_tmp;
 commit;

ansible/files/admin_api_scripts/pg_upgrade_scripts/complete.sh

@@ -78,6 +78,9 @@ EOF
 
         run_sql -c "$RECREATE_PG_CRON_QUERY"
     fi
+
+    # #incident-2024-09-12-project-upgrades-are-temporarily-disabled
+    run_sql -c "grant pg_read_all_data, pg_signal_backend to postgres"
 }
 
 function complete_pg_upgrade {

ebssurrogate/scripts/surrogate-bootstrap-nix.sh

@@ -110,6 +110,11 @@ function format_and_mount_rootfs {
 	fi
 
 	mkfs.ext4 /dev/xvdh
+
+	# Explicitly reserving 100MiB worth of blocks for the data volume
+	RESERVED_DATA_VOLUME_BLOCK_COUNT=$((100 * 1024 * 1024 / 4096))
+	tune2fs -r $RESERVED_DATA_VOLUME_BLOCK_COUNT /dev/xvdh
+
 	mkdir -p /mnt/data
 	mount -o defaults,discard /dev/xvdh /mnt/data
 }

scripts/90-cleanup.sh

@@ -36,7 +36,10 @@ elif [ -n "$(command -v apt-get)" ]; then
 	libicu-dev \
 	libcgal-dev \
 	libgcc-9-dev \
-	libgcc-8-dev
+	libgcc-8-dev \
+ 	ansible
+
+  add-apt-repository --yes --remove ppa:ansible/ansible
 
   source /etc/os-release
   apt-get -y remove --purge linux-headers-5.11.0-1021-aws

scripts/nix-provision.sh

@@ -38,8 +38,12 @@ EOF
         $ARGS
 }
 
+function cleanup_packages {
+    apt-get -y remove --purge ansible
+    add-apt-repository --yes --remove ppa:ansible/ansible
+}
 
 install_packages
 install_nix
 execute_stage2_playbook
-
+cleanup_packages