From 366796a72e849baa4efec51235294782490195ed Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Wed, 7 Jul 2021 15:45:55 +0200 Subject: [PATCH 1/3] Add test for idempotency of citus_prepare_pg_upgrade --- src/test/regress/upgrade/pg_upgrade_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/regress/upgrade/pg_upgrade_test.py b/src/test/regress/upgrade/pg_upgrade_test.py index 205f1058d..b94442573 100755 --- a/src/test/regress/upgrade/pg_upgrade_test.py +++ b/src/test/regress/upgrade/pg_upgrade_test.py @@ -66,6 +66,8 @@ def main(config): common.run_pg_regress(config.old_bindir, config.pg_srcdir, NODE_PORTS[COORDINATOR_NAME], AFTER_PG_UPGRADE_SCHEDULE) + citus_prepare_pg_upgrade(config.old_bindir) + # prepare should be idempotent, calling it a second time should never fail. citus_prepare_pg_upgrade(config.old_bindir) common.stop_databases(config.old_bindir, config.old_datadir) From e5517dc7b3ee82b007fd635928d57404d9bdab6c Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Wed, 7 Jul 2021 15:46:51 +0200 Subject: [PATCH 2/3] fix 9.5-2 upgrade script to adhere to idempotency --- .../distributed/sql/udfs/citus_prepare_pg_upgrade/9.5-2.sql | 1 + 1 file changed, 1 insertion(+) 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 index 89e3ad3c6..da7d10376 100644 --- 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 @@ -18,6 +18,7 @@ BEGIN 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; + DROP TABLE IF EXISTS public.pg_dist_object; -- -- backup citus catalog tables From 18652ef9ffe452dfcf51e2d2983ca05a0672d34f Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Wed, 7 Jul 2021 15:47:13 +0200 Subject: [PATCH 3/3] fix 10.1-1 upgrade script to adhere to idempotency --- .../distributed/sql/udfs/citus_prepare_pg_upgrade/10.1-1.sql | 1 + .../distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/10.1-1.sql b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/10.1-1.sql index 8643f3943..fa2014870 100644 --- a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/10.1-1.sql +++ b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/10.1-1.sql @@ -18,6 +18,7 @@ BEGIN 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; + DROP TABLE IF EXISTS public.pg_dist_object; -- -- backup citus catalog tables diff --git a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql index 8643f3943..fa2014870 100644 --- a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql +++ b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql @@ -18,6 +18,7 @@ BEGIN 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; + DROP TABLE IF EXISTS public.pg_dist_object; -- -- backup citus catalog tables