pull/7218/head
Onur Tirtir 2023-09-24 18:49:18 +03:00
parent 67a1beee79
commit 6393c10122
1 changed files with 9 additions and 8 deletions

View File

@ -115,10 +115,9 @@ def remove_tar_files(tar_path):
def restart_databases(pg_path, rel_data_path, mixed_mode, config): def restart_databases(pg_path, rel_data_path, mixed_mode, config):
for node_name in config.node_name_to_ports.keys(): for node_name in config.node_name_to_ports.keys():
if ( if mixed_mode and config.node_name_to_ports[node_name] in (
mixed_mode config.chosen_random_worker_port,
and config.node_name_to_ports[node_name] in config.coordinator_port(),
(config.chosen_random_worker_port, config.coordinator_port())
): ):
continue continue
abs_data_path = os.path.abspath(os.path.join(rel_data_path, node_name)) abs_data_path = os.path.abspath(os.path.join(rel_data_path, node_name))
@ -149,8 +148,10 @@ def restart_database(pg_path, abs_data_path, node_name, node_ports, logfile_pref
def run_alter_citus(pg_path, mixed_mode, config): def run_alter_citus(pg_path, mixed_mode, config):
for port in config.node_name_to_ports.values(): for port in config.node_name_to_ports.values():
if (mixed_mode and if mixed_mode and port in (
port in (config.chosen_random_worker_port, config.coordinator_port())): config.chosen_random_worker_port,
config.coordinator_port(),
):
continue continue
utils.psql(pg_path, port, "ALTER EXTENSION citus UPDATE;") utils.psql(pg_path, port, "ALTER EXTENSION citus UPDATE;")
@ -160,8 +161,8 @@ def verify_upgrade(config, mixed_mode, node_ports):
actual_citus_version = get_actual_citus_version(config.bindir, port) actual_citus_version = get_actual_citus_version(config.bindir, port)
expected_citus_version = MASTER_VERSION expected_citus_version = MASTER_VERSION
if expected_citus_version != actual_citus_version and not ( if expected_citus_version != actual_citus_version and not (
mixed_mode and mixed_mode
port in (config.chosen_random_worker_port, config.coordinator_port()) and port in (config.chosen_random_worker_port, config.coordinator_port())
): ):
print( print(
"port: {} citus version {} expected {}".format( "port: {} citus version {} expected {}".format(