From 636bdda886b45aeb9f35c6386e3402679ced26a5 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Fri, 25 Jun 2021 15:57:04 +0200 Subject: [PATCH] Fix PG upgrade scripts for 9.5 --- .../distributed/sql/citus--9.5-1--9.5-2.sql | 3 + .../distributed/sql/citus--9.5-2--9.5-1.sql | 9 ++ .../udfs/citus_finish_pg_upgrade/9.5-2.sql | 106 ++++++++++++++++++ .../udfs/citus_prepare_pg_upgrade/9.5-2.sql | 59 ++++++++++ src/test/regress/expected/multi_extension.out | 23 ++++ src/test/regress/sql/multi_extension.sql | 14 +++ 6 files changed, 214 insertions(+) create mode 100644 src/backend/distributed/sql/citus--9.5-1--9.5-2.sql create mode 100644 src/backend/distributed/sql/citus--9.5-2--9.5-1.sql create mode 100644 src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/9.5-2.sql create mode 100644 src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/9.5-2.sql diff --git a/src/backend/distributed/sql/citus--9.5-1--9.5-2.sql b/src/backend/distributed/sql/citus--9.5-1--9.5-2.sql new file mode 100644 index 000000000..8af22f8db --- /dev/null +++ b/src/backend/distributed/sql/citus--9.5-1--9.5-2.sql @@ -0,0 +1,3 @@ +-- 9.5-1--9.5-2 was added later as a patch to fix a bug in our PG upgrade functions +#include "udfs/citus_prepare_pg_upgrade/9.5-2.sql" +#include "udfs/citus_finish_pg_upgrade/9.5-2.sql" diff --git a/src/backend/distributed/sql/citus--9.5-2--9.5-1.sql b/src/backend/distributed/sql/citus--9.5-2--9.5-1.sql new file mode 100644 index 000000000..580d2b4d6 --- /dev/null +++ b/src/backend/distributed/sql/citus--9.5-2--9.5-1.sql @@ -0,0 +1,9 @@ +-- +-- 9.5-1--9.5-2 was added later as a patch to fix a bug in our PG upgrade functions +-- +-- This script brings users who installed the patch released back to the 9.5-1 +-- upgrade path. We do this via a semantical downgrade since there has already been +-- introduced new changes in the schema from 9.5-1 to 10.0-1. To make sure we include all +-- changes made during that version change we decide to use the existing upgrade path from +-- our later introduced 9.5-1 version. +-- diff --git a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/9.5-2.sql b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/9.5-2.sql new file mode 100644 index 000000000..cdbde146c --- /dev/null +++ b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/9.5-2.sql @@ -0,0 +1,106 @@ +CREATE OR REPLACE FUNCTION pg_catalog.citus_finish_pg_upgrade() + RETURNS void + LANGUAGE plpgsql + SET search_path = pg_catalog + AS $cppu$ +DECLARE + table_name regclass; + command text; + trigger_name text; +BEGIN + -- + -- restore citus catalog tables + -- + INSERT INTO pg_catalog.pg_dist_partition SELECT * FROM public.pg_dist_partition; + INSERT INTO pg_catalog.pg_dist_shard SELECT * FROM public.pg_dist_shard; + INSERT INTO pg_catalog.pg_dist_placement SELECT * FROM public.pg_dist_placement; + INSERT INTO pg_catalog.pg_dist_node_metadata SELECT * FROM public.pg_dist_node_metadata; + INSERT INTO pg_catalog.pg_dist_node SELECT * FROM public.pg_dist_node; + INSERT INTO pg_catalog.pg_dist_local_group SELECT * FROM public.pg_dist_local_group; + INSERT INTO pg_catalog.pg_dist_transaction SELECT * FROM public.pg_dist_transaction; + INSERT INTO pg_catalog.pg_dist_colocation SELECT * FROM public.pg_dist_colocation; + -- enterprise catalog tables + INSERT INTO pg_catalog.pg_dist_authinfo SELECT * FROM public.pg_dist_authinfo; + INSERT INTO pg_catalog.pg_dist_poolinfo SELECT * FROM public.pg_dist_poolinfo; + + ALTER TABLE pg_catalog.pg_dist_rebalance_strategy DISABLE TRIGGER pg_dist_rebalance_strategy_enterprise_check_trigger; + INSERT INTO pg_catalog.pg_dist_rebalance_strategy SELECT + name, + default_strategy, + shard_cost_function::regprocedure::regproc, + node_capacity_function::regprocedure::regproc, + shard_allowed_on_node_function::regprocedure::regproc, + default_threshold, + minimum_threshold + FROM public.pg_dist_rebalance_strategy; + ALTER TABLE pg_catalog.pg_dist_rebalance_strategy ENABLE TRIGGER pg_dist_rebalance_strategy_enterprise_check_trigger; + + -- + -- drop backup tables + -- + DROP TABLE public.pg_dist_authinfo; + DROP TABLE public.pg_dist_colocation; + DROP TABLE public.pg_dist_local_group; + DROP TABLE public.pg_dist_node; + DROP TABLE public.pg_dist_node_metadata; + DROP TABLE public.pg_dist_partition; + DROP TABLE public.pg_dist_placement; + DROP TABLE public.pg_dist_poolinfo; + DROP TABLE public.pg_dist_shard; + DROP TABLE public.pg_dist_transaction; + DROP TABLE public.pg_dist_rebalance_strategy; + + -- + -- reset sequences + -- + PERFORM setval('pg_catalog.pg_dist_shardid_seq', (SELECT MAX(shardid)+1 AS max_shard_id FROM pg_dist_shard), false); + PERFORM setval('pg_catalog.pg_dist_placement_placementid_seq', (SELECT MAX(placementid)+1 AS max_placement_id FROM pg_dist_placement), false); + PERFORM setval('pg_catalog.pg_dist_groupid_seq', (SELECT MAX(groupid)+1 AS max_group_id FROM pg_dist_node), false); + PERFORM setval('pg_catalog.pg_dist_node_nodeid_seq', (SELECT MAX(nodeid)+1 AS max_node_id FROM pg_dist_node), false); + PERFORM setval('pg_catalog.pg_dist_colocationid_seq', (SELECT MAX(colocationid)+1 AS max_colocation_id FROM pg_dist_colocation), false); + + -- + -- register triggers + -- + FOR table_name IN SELECT logicalrelid FROM pg_catalog.pg_dist_partition + LOOP + trigger_name := 'truncate_trigger_' || table_name::oid; + command := 'create trigger ' || trigger_name || ' after truncate on ' || table_name || ' execute procedure pg_catalog.citus_truncate_trigger()'; + EXECUTE command; + command := 'update pg_trigger set tgisinternal = true where tgname = ' || quote_literal(trigger_name); + EXECUTE command; + END LOOP; + + -- + -- set dependencies + -- + INSERT INTO pg_depend + SELECT + 'pg_class'::regclass::oid as classid, + p.logicalrelid::regclass::oid as objid, + 0 as objsubid, + 'pg_extension'::regclass::oid as refclassid, + (select oid from pg_extension where extname = 'citus') as refobjid, + 0 as refobjsubid , + 'n' as deptype + FROM pg_catalog.pg_dist_partition p; + + -- restore pg_dist_object from the stable identifiers + TRUNCATE citus.pg_dist_object; + INSERT INTO citus.pg_dist_object (classid, objid, objsubid, distribution_argument_index, colocationid) + SELECT + address.classid, + address.objid, + address.objsubid, + naming.distribution_argument_index, + naming.colocationid + FROM + public.pg_dist_object naming, + pg_catalog.pg_get_object_address(naming.type, naming.object_names, naming.object_args) address; + + DROP TABLE public.pg_dist_object; +END; +$cppu$; + +COMMENT ON FUNCTION pg_catalog.citus_finish_pg_upgrade() + IS 'perform tasks to restore citus settings from a location that has been prepared before pg_upgrade'; diff --git a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/9.5-2.sql b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/9.5-2.sql new file mode 100644 index 000000000..89e3ad3c6 --- /dev/null +++ b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/9.5-2.sql @@ -0,0 +1,59 @@ +CREATE OR REPLACE FUNCTION pg_catalog.citus_prepare_pg_upgrade() + RETURNS void + LANGUAGE plpgsql + SET search_path = pg_catalog + AS $cppu$ +BEGIN + -- + -- Drop existing backup tables + -- + DROP TABLE IF EXISTS public.pg_dist_partition; + DROP TABLE IF EXISTS public.pg_dist_shard; + DROP TABLE IF EXISTS public.pg_dist_placement; + DROP TABLE IF EXISTS public.pg_dist_node_metadata; + DROP TABLE IF EXISTS public.pg_dist_node; + DROP TABLE IF EXISTS public.pg_dist_local_group; + DROP TABLE IF EXISTS public.pg_dist_transaction; + DROP TABLE IF EXISTS public.pg_dist_colocation; + DROP TABLE IF EXISTS public.pg_dist_authinfo; + DROP TABLE IF EXISTS public.pg_dist_poolinfo; + DROP TABLE IF EXISTS public.pg_dist_rebalance_strategy; + + -- + -- backup citus catalog tables + -- + CREATE TABLE public.pg_dist_partition AS SELECT * FROM pg_catalog.pg_dist_partition; + CREATE TABLE public.pg_dist_shard AS SELECT * FROM pg_catalog.pg_dist_shard; + CREATE TABLE public.pg_dist_placement AS SELECT * FROM pg_catalog.pg_dist_placement; + CREATE TABLE public.pg_dist_node_metadata AS SELECT * FROM pg_catalog.pg_dist_node_metadata; + CREATE TABLE public.pg_dist_node AS SELECT * FROM pg_catalog.pg_dist_node; + CREATE TABLE public.pg_dist_local_group AS SELECT * FROM pg_catalog.pg_dist_local_group; + CREATE TABLE public.pg_dist_transaction AS SELECT * FROM pg_catalog.pg_dist_transaction; + CREATE TABLE public.pg_dist_colocation AS SELECT * FROM pg_catalog.pg_dist_colocation; + -- enterprise catalog tables + CREATE TABLE public.pg_dist_authinfo AS SELECT * FROM pg_catalog.pg_dist_authinfo; + CREATE TABLE public.pg_dist_poolinfo AS SELECT * FROM pg_catalog.pg_dist_poolinfo; + CREATE TABLE public.pg_dist_rebalance_strategy AS SELECT + name, + default_strategy, + shard_cost_function::regprocedure::text, + node_capacity_function::regprocedure::text, + shard_allowed_on_node_function::regprocedure::text, + default_threshold, + minimum_threshold + FROM pg_catalog.pg_dist_rebalance_strategy; + + -- store upgrade stable identifiers on pg_dist_object catalog + CREATE TABLE public.pg_dist_object AS SELECT + address.type, + address.object_names, + address.object_args, + objects.distribution_argument_index, + objects.colocationid + FROM citus.pg_dist_object objects, + pg_catalog.pg_identify_object_as_address(objects.classid, objects.objid, objects.objsubid) address; +END; +$cppu$; + +COMMENT ON FUNCTION pg_catalog.citus_prepare_pg_upgrade() + IS 'perform tasks to copy citus settings to a location that could later be restored after pg_upgrade is done'; diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index c61970afa..265fc4844 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -476,6 +476,29 @@ SELECT * FROM print_extension_changes(); | function worker_record_sequence_dependency(regclass,regclass,name) (10 rows) +-- Test upgrade paths for backported citus_pg_upgrade functions +ALTER EXTENSION citus UPDATE TO '9.5-2'; +ALTER EXTENSION citus UPDATE TO '9.5-1'; +-- Should be empty result, even though the downgrade doesn't undo the upgrade, the +-- function signature doesn't change, which is reflected here. +SELECT * FROM print_extension_changes(); + previous_object | current_object +--------------------------------------------------------------------- +(0 rows) + +ALTER EXTENSION citus UPDATE TO '9.5-2'; +SELECT * FROM print_extension_changes(); + previous_object | current_object +--------------------------------------------------------------------- +(0 rows) + +-- Snapshot of state at 9.5-1 +ALTER EXTENSION citus UPDATE TO '9.5-1'; +SELECT * FROM print_extension_changes(); + previous_object | current_object +--------------------------------------------------------------------- +(0 rows) + DROP TABLE prev_objects, extension_diff; -- show running version SHOW citus.version; diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 509f70cdd..f1cbc1d18 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -229,6 +229,20 @@ SELECT * FROM print_extension_changes(); ALTER EXTENSION citus UPDATE TO '9.5-1'; SELECT * FROM print_extension_changes(); +-- Test upgrade paths for backported citus_pg_upgrade functions +ALTER EXTENSION citus UPDATE TO '9.5-2'; +ALTER EXTENSION citus UPDATE TO '9.5-1'; +-- Should be empty result, even though the downgrade doesn't undo the upgrade, the +-- function signature doesn't change, which is reflected here. +SELECT * FROM print_extension_changes(); + +ALTER EXTENSION citus UPDATE TO '9.5-2'; +SELECT * FROM print_extension_changes(); + +-- Snapshot of state at 9.5-1 +ALTER EXTENSION citus UPDATE TO '9.5-1'; +SELECT * FROM print_extension_changes(); + DROP TABLE prev_objects, extension_diff; -- show running version