external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix upgrade tests

pull/6843/head
Emel Şimşek 2023-04-06 22:10:31 +03:00
parent 94af8e9956
commit 4a6eb5009f
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/test/regress/citus_tests/common.py
View File

@ -25,15 +25,7 @@ import utils
from psycopg import sql from psycopg import sql
from utils import USER from utils import USER
from config import ( # noqa: E402 CITUS_VERSION_SQL = "SELECT extversion FROM pg_extension WHERE extname = 'citus';"
AFTER_CITUS_UPGRADE_COORD_SCHEDULE,
BEFORE_CITUS_UPGRADE_COORD_SCHEDULE,
CITUS_VERSION_SQL,
MASTER_VERSION,
MIXED_AFTER_CITUS_UPGRADE_SCHEDULE,
MIXED_BEFORE_CITUS_UPGRADE_SCHEDULE,
CitusUpgradeConfig,
)
LINUX = False LINUX = False
MACOS = False MACOS = False
@ -344,6 +336,7 @@ def get_actual_citus_version(pg_path, port):
citus_version = citus_version.decode("utf-8") citus_version = citus_version.decode("utf-8")
return get_version_number(citus_version) return get_version_number(citus_version)
def initialize_citus_cluster(bindir, datadir, settings, config): def initialize_citus_cluster(bindir, datadir, settings, config):
# In case there was a leftover from previous runs, stop the databases # In case there was a leftover from previous runs, stop the databases
stop_databases( stop_databases(
@ -357,9 +350,11 @@ def initialize_citus_cluster(bindir, datadir, settings, config):
) )
create_citus_extension(bindir, config.node_name_to_ports.values()) create_citus_extension(bindir, config.node_name_to_ports.values())
actual_citus_version = get_actual_citus_version(config.bindir, config.coordinator_port()) actual_citus_version = get_actual_citus_version(
config.bindir, config.coordinator_port()
)
if actual_citus_version == '11.3': if actual_citus_version == "11.3":
add_coordinator_to_metadata(bindir, config.coordinator_port()) add_coordinator_to_metadata(bindir, config.coordinator_port())
add_workers(bindir, config.worker_ports, config.coordinator_port()) add_workers(bindir, config.worker_ports, config.coordinator_port())