From 22a18fc1f25c89030842f6659efa5bedfbcdc288 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Wed, 16 Mar 2022 22:01:47 +0100 Subject: [PATCH 1/2] Fix typo in upgrade function --- .../sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql | 2 +- .../sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql b/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql index d93dd0f93..ffdc87fc0 100644 --- a/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql +++ b/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql @@ -123,7 +123,7 @@ END; GROUP BY result; IF enforce_version_check AND worker_node_version_count != 1 THEN RAISE EXCEPTION 'All nodes should have the same Citus version installed. Currently ' - 'the some of the workers has version different versions'; + 'some of the workers have different versions.'; ELSE RAISE DEBUG 'All worker nodes have the same Citus version'; END IF; diff --git a/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql b/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql index d93dd0f93..ffdc87fc0 100644 --- a/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql +++ b/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql @@ -123,7 +123,7 @@ END; GROUP BY result; IF enforce_version_check AND worker_node_version_count != 1 THEN RAISE EXCEPTION 'All nodes should have the same Citus version installed. Currently ' - 'the some of the workers has version different versions'; + 'some of the workers have different versions.'; ELSE RAISE DEBUG 'All worker nodes have the same Citus version'; END IF; From 5bb5359da00453f7b2cdb92deade342e41a77599 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Wed, 16 Mar 2022 22:09:22 +0100 Subject: [PATCH 2/2] Fix worker node version check --- .../sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql | 5 ++--- .../sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql b/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql index ffdc87fc0..7b7d357ff 100644 --- a/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql +++ b/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql @@ -117,10 +117,9 @@ END; -- first, check if all nodes have the same versions SELECT - count(*) INTO worker_node_version_count + count(distinct result) INTO worker_node_version_count FROM - run_command_on_workers('SELECT extversion from pg_extension WHERE extname = ''citus'';') - GROUP BY result; + run_command_on_workers('SELECT extversion from pg_extension WHERE extname = ''citus'''); IF enforce_version_check AND worker_node_version_count != 1 THEN RAISE EXCEPTION 'All nodes should have the same Citus version installed. Currently ' 'some of the workers have different versions.'; diff --git a/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql b/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql index ffdc87fc0..7b7d357ff 100644 --- a/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql +++ b/src/backend/distributed/sql/udfs/citus_finalize_upgrade_to_citus11/latest.sql @@ -117,10 +117,9 @@ END; -- first, check if all nodes have the same versions SELECT - count(*) INTO worker_node_version_count + count(distinct result) INTO worker_node_version_count FROM - run_command_on_workers('SELECT extversion from pg_extension WHERE extname = ''citus'';') - GROUP BY result; + run_command_on_workers('SELECT extversion from pg_extension WHERE extname = ''citus'''); IF enforce_version_check AND worker_node_version_count != 1 THEN RAISE EXCEPTION 'All nodes should have the same Citus version installed. Currently ' 'some of the workers have different versions.';