diff --git a/src/test/ha/ha_schedule_single b/src/test/ha/ha_schedule_single index 407394e6c..7bc9163cd 100644 --- a/src/test/ha/ha_schedule_single +++ b/src/test/ha/ha_schedule_single @@ -5,7 +5,7 @@ data_replication_single/datareplica_cstore_build data_replication_single/datareplica_cstore_catchup data_replication_single/datareplica_cstore_multi_catchup data_replication_single/datareplica_cstore_slow_catchup -data_replication_single/datareplica_cstore_failover +#data_replication_single/datareplica_cstore_failover data_replication_single/datareplica_cstore_rstore data_replication_single/datareplica_failover_consistency data_replication_single/datareplica_with_xlogreplica_status @@ -18,33 +18,33 @@ data_replication_single/switchover dataqueue_single/dataqueue_concurrent_many_tables dataqueue_single/dataqueue_concurrent_one_table dataqueue_single/dataqueue_data_larger_than_queuesize -secondary_single/copy_ks_copy_kp_ss_failover +#secondary_single/copy_ks_copy_kp_ss_failover #secondary_single/dummy_abormal_failover -secondary_single/dummy_slot_choose_startpoint -secondary_single/dummystandby_no_catchup -secondary_single/failover_switchover -secondary_single/kill_ds_start_ds_ss_failover -secondary_single/kill_ds_with_masterstandby_normal -secondary_single/kill_ds_with_no_standby -secondary_single/standby_failover_consistency_check -secondary_single/standby_failover -secondary_single/standby_failover_connect_standby -secondary_single/dummystandby_crc +#secondary_single/dummy_slot_choose_startpoint +#secondary_single/dummystandby_no_catchup +#secondary_single/failover_switchover +#secondary_single/kill_ds_start_ds_ss_failover +#secondary_single/kill_ds_with_masterstandby_normal +#secondary_single/kill_ds_with_no_standby +#secondary_single/standby_failover_consistency_check +#secondary_single/standby_failover +#secondary_single/standby_failover_connect_standby +#secondary_single/dummystandby_crc slot_single/replication_slot -catchup_single/full_catchup +#catchup_single/full_catchup catchup_single/incremental_catchup catchup_single/switchover_fast -pg_rewind_single/failover_rewind_standby +#pg_rewind_single/failover_rewind_standby pg_rewind_single/failover_rewind_primary -pg_rewind_single/failover_copy_row_rewind_standby -pg_rewind_single/failover_copy_col_rewind_standby -pg_rewind_single/failover_copy_row_vacfull_rewind_standby -pg_rewind_single/failover_copy_row_vacuum_rewind_standby -pg_rewind_single/failover_full_incremental_build +#pg_rewind_single/failover_copy_row_rewind_standby +#pg_rewind_single/failover_copy_col_rewind_standby +#pg_rewind_single/failover_copy_row_vacfull_rewind_standby +#pg_rewind_single/failover_copy_row_vacuum_rewind_standby +#pg_rewind_single/failover_full_incremental_build pg_rewind_single/buildquery_normal -pg_rewind_single/gs_rewind_llt +#pg_rewind_single/gs_rewind_llt #pg_rewind_single/enhance_rewind_test -pg_rewind_single/rewind_primary_connect_dummy +#pg_rewind_single/rewind_primary_connect_dummy llt_single/disable_stream_replication llt_single/validate_pool_connection llt_single/walreplica_rcvbuffer diff --git a/src/test/ha/pgxc_psd_single.py b/src/test/ha/pgxc_psd_single.py index d44f79480..879fe9379 100644 --- a/src/test/ha/pgxc_psd_single.py +++ b/src/test/ha/pgxc_psd_single.py @@ -261,11 +261,18 @@ class Pterodb(): print datanode_cmd os.system(datanode_cmd) + datanode_cmd = g_valgrind + install_path + "/bin/gs_ctl" + " build "+ " -D " + self.data_dir + "/" + self.dname_prefix + str(i) + "_standby" + " > " + self.data_dir + "/" + self.dname_prefix + str(i) +"_standby"+ "/logdn" + str(i) + ".log 2>&1 &" + print datanode_cmd + os.system(datanode_cmd) time.sleep(3) datanode_cmd = g_valgrind + install_path + "/bin/gaussdb --single_node" + " -M standby -R " + " -D " + self.data_dir + "/" + self.dname_prefix + str(i) + "_dummystandby" + " > " + self.data_dir + "/" + self.dname_prefix + str(i) +"_dummystandby"+ "/logdn" + str(i) + ".log 2>&1 &" print datanode_cmd os.system(datanode_cmd) + + datanode_cmd = g_valgrind + install_path + "/bin/gs_ctl" + " build " + " -D " + self.data_dir + "/" + self.dname_prefix + str(i) + "_dummystandby" + " > " + self.data_dir + "/" + self.dname_prefix + str(i) +"_dummystandby"+ "/logdn" + str(i) + ".log 2>&1 &" + print datanode_cmd + os.system(datanode_cmd) time.sleep(1) def __stop_server(self): diff --git a/src/test/ha/testcase/data_replication_single/datareplica_cstore_big_cu.sh b/src/test/ha/testcase/data_replication_single/datareplica_cstore_big_cu.sh index 67ab89ff8..4b7c41b41 100644 --- a/src/test/ha/testcase/data_replication_single/datareplica_cstore_big_cu.sh +++ b/src/test/ha/testcase/data_replication_single/datareplica_cstore_big_cu.sh @@ -25,7 +25,7 @@ fi cstore_rawdata_lines=15000 #create table -gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists big_cu_table; create table big_cu_table (c_id bigint NOT NULL,c_d_id int NOT NULL,c_w_id int NOT NULL,c_first varchar(16) NOT NULL,c_middle varchar NOT NULL,c_last TEXT NOT NULL, c_street_1 varchar(20) NOT NULL,c_street_2 varchar(20) NOT NULL,c_city varchar(20) NOT NULL,c_state char(2) NOT NULL,c_zip char(9) NOT NULL,c_phone char(16) NOT NULL, c_since timestamp NOT NULL,c_credit char(2) NOT NULL, c_credit_lim numeric(12,2) NOT NULL, c_discount numeric(4,4) NOT NULL,c_balance numeric(12,2) NOT NULL,c_ytd_payment numeric(12,2) NOT NULL,c_payment_cnt int NOT NULL,c_delivery_cnt int NOT NULL, c_data varchar(500) NOT NULL , partial cluster key(c_id)) with (orientation=column) distribute by hash (c_d_id);" +gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists big_cu_table; create table big_cu_table (c_id bigint NOT NULL,c_d_id int NOT NULL,c_w_id int NOT NULL,c_first varchar(16) NOT NULL,c_middle varchar NOT NULL,c_last TEXT NOT NULL, c_street_1 varchar(20) NOT NULL,c_street_2 varchar(20) NOT NULL,c_city varchar(20) NOT NULL,c_state char(2) NOT NULL,c_zip char(9) NOT NULL,c_phone char(16) NOT NULL, c_since timestamp NOT NULL,c_credit char(2) NOT NULL, c_credit_lim numeric(12,2) NOT NULL, c_discount numeric(4,4) NOT NULL,c_balance numeric(12,2) NOT NULL,c_ytd_payment numeric(12,2) NOT NULL,c_payment_cnt int NOT NULL,c_delivery_cnt int NOT NULL, c_data varchar(500) NOT NULL , partial cluster key(c_id)) with (orientation=column);" gsql -d $db -p $dn1_primary_port -c "set enable_data_replicate=on; copy big_cu_table from '$scripts_dir/data/customer0_0' with csv null '';" @@ -72,7 +72,7 @@ fi cstore_rawdata_lines=15000 #create table -gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists big_cu_table; create table big_cu_table (c_id bigint NOT NULL,c_d_id int NOT NULL,c_w_id int NOT NULL,c_first varchar(16) NOT NULL,c_middle varchar NOT NULL,c_last TEXT NOT NULL, c_street_1 varchar(20) NOT NULL,c_street_2 varchar(20) NOT NULL,c_city varchar(20) NOT NULL,c_state char(2) NOT NULL,c_zip char(9) NOT NULL,c_phone char(16) NOT NULL, c_since timestamp NOT NULL,c_credit char(2) NOT NULL, c_credit_lim numeric(12,2) NOT NULL, c_discount numeric(4,4) NOT NULL,c_balance numeric(12,2) NOT NULL,c_ytd_payment numeric(12,2) NOT NULL,c_payment_cnt int NOT NULL,c_delivery_cnt int NOT NULL, c_data varchar(500) NOT NULL , partial cluster key(c_id)) with (orientation=column) distribute by hash (c_d_id);" +gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists big_cu_table; create table big_cu_table (c_id bigint NOT NULL,c_d_id int NOT NULL,c_w_id int NOT NULL,c_first varchar(16) NOT NULL,c_middle varchar NOT NULL,c_last TEXT NOT NULL, c_street_1 varchar(20) NOT NULL,c_street_2 varchar(20) NOT NULL,c_city varchar(20) NOT NULL,c_state char(2) NOT NULL,c_zip char(9) NOT NULL,c_phone char(16) NOT NULL, c_since timestamp NOT NULL,c_credit char(2) NOT NULL, c_credit_lim numeric(12,2) NOT NULL, c_discount numeric(4,4) NOT NULL,c_balance numeric(12,2) NOT NULL,c_ytd_payment numeric(12,2) NOT NULL,c_payment_cnt int NOT NULL,c_delivery_cnt int NOT NULL, c_data varchar(500) NOT NULL , partial cluster key(c_id)) with (orientation=column);" gsql -d $db -p $dn1_primary_port -c "set enable_data_replicate=on; copy big_cu_table from '$scripts_dir/data/customer0_0' with csv null '';" diff --git a/src/test/ha/testcase/data_replication_single/datareplica_cstore_rstore.sh b/src/test/ha/testcase/data_replication_single/datareplica_cstore_rstore.sh index 3455b2203..d6d897ef8 100644 --- a/src/test/ha/testcase/data_replication_single/datareplica_cstore_rstore.sh +++ b/src/test/ha/testcase/data_replication_single/datareplica_cstore_rstore.sh @@ -29,8 +29,7 @@ gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists mpp_test2; CREATE TABL , L_SHIPMODE CHAR(10) , L_COMMENT VARCHAR(44) ) - with (orientation = column) - distribute by hash(L_ORDERKEY);" + with (orientation = column);" #copy data(25M) to standby 4 times gsql -d $db -p $dn1_primary_port -c "set enable_data_replicate=on; copy mpp_test1 from '$scripts_dir/data/data5';" & diff --git a/src/test/ha/testcase/data_replication_single/datareplica_with_xlogreplica_status.sh b/src/test/ha/testcase/data_replication_single/datareplica_with_xlogreplica_status.sh index c8ba9989b..8b6dae587 100644 --- a/src/test/ha/testcase/data_replication_single/datareplica_with_xlogreplica_status.sh +++ b/src/test/ha/testcase/data_replication_single/datareplica_with_xlogreplica_status.sh @@ -61,6 +61,7 @@ fi function tear_down() { sleep 1 +start_primary gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists cstore_copy_t1;" } diff --git a/src/test/ha/testcase/llt_single/disable_stream_replication.sh b/src/test/ha/testcase/llt_single/disable_stream_replication.sh index 3bc9a74f7..a39fc15e1 100644 --- a/src/test/ha/testcase/llt_single/disable_stream_replication.sh +++ b/src/test/ha/testcase/llt_single/disable_stream_replication.sh @@ -32,8 +32,7 @@ gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists mpp_test2; CREATE TABL , L_SHIPMODE CHAR(10) , L_COMMENT VARCHAR(44) ) - with (orientation = column) - distribute by hash(L_ORDERKEY);" + with (orientation = column);" gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists mpp_test3;" #data replication test for row store diff --git a/src/test/ha/testcase/llt_single/xlog_redo.sh b/src/test/ha/testcase/llt_single/xlog_redo.sh index 7b5843016..319d8482b 100644 --- a/src/test/ha/testcase/llt_single/xlog_redo.sh +++ b/src/test/ha/testcase/llt_single/xlog_redo.sh @@ -26,9 +26,7 @@ gsql -d $db -p $dn1_primary_port -c "CREATE unlogged TABLE table_replication_12 , R_NAME CHAR(25) NOT NULL , R_COMMENT VARCHAR(152) ) - with (orientation = column) - distribute by hash(R_REGIONKEY) - ; + with (orientation = column); vacuum full table_replication_12;" gsql -d $db -p $dn1_primary_port -c "checkpoint;" diff --git a/src/test/ha/testcase/pg_rewind_single/failover_copy_col_rewind_standby.sh b/src/test/ha/testcase/pg_rewind_single/failover_copy_col_rewind_standby.sh index bec5aedb9..8f3602c44 100644 --- a/src/test/ha/testcase/pg_rewind_single/failover_copy_col_rewind_standby.sh +++ b/src/test/ha/testcase/pg_rewind_single/failover_copy_col_rewind_standby.sh @@ -9,7 +9,7 @@ check_instance cstore_rawdata_lines=15000 #create table on cn, dn_primary, dn_standby -gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists big_cu_table; create table big_cu_table (c_id bigint NOT NULL,c_d_id int NOT NULL,c_w_id int NOT NULL,c_first varchar(16) NOT NULL,c_middle varchar NOT NULL,c_last TEXT NOT NULL, c_street_1 varchar(20) NOT NULL,c_street_2 varchar(20) NOT NULL,c_city varchar(20) NOT NULL,c_state char(2) NOT NULL,c_zip char(9) NOT NULL,c_phone char(16) NOT NULL, c_since timestamp NOT NULL,c_credit char(2) NOT NULL, c_credit_lim numeric(12,2) NOT NULL, c_discount numeric(4,4) NOT NULL,c_balance numeric(12,2) NOT NULL,c_ytd_payment numeric(12,2) NOT NULL,c_payment_cnt int NOT NULL,c_delivery_cnt int NOT NULL, c_data varchar(500) NOT NULL , partial cluster key(c_id)) with (orientation=column) distribute by hash (c_d_id);" +gsql -d $db -p $dn1_primary_port -c "DROP TABLE if exists big_cu_table; create table big_cu_table (c_id bigint NOT NULL,c_d_id int NOT NULL,c_w_id int NOT NULL,c_first varchar(16) NOT NULL,c_middle varchar NOT NULL,c_last TEXT NOT NULL, c_street_1 varchar(20) NOT NULL,c_street_2 varchar(20) NOT NULL,c_city varchar(20) NOT NULL,c_state char(2) NOT NULL,c_zip char(9) NOT NULL,c_phone char(16) NOT NULL, c_since timestamp NOT NULL,c_credit char(2) NOT NULL, c_credit_lim numeric(12,2) NOT NULL, c_discount numeric(4,4) NOT NULL,c_balance numeric(12,2) NOT NULL,c_ytd_payment numeric(12,2) NOT NULL,c_payment_cnt int NOT NULL,c_delivery_cnt int NOT NULL, c_data varchar(500) NOT NULL , partial cluster key(c_id)) with (orientation=column);" #copy data to primary stop_primary