database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!6466 6.0.0代码回合

Browse Source 
Merge pull request !6466 from 张悦萌/code-master
This commit is contained in:
opengauss_bot
2024-09-26 03:03:17 +00:00
committed by Gitee
parent a7b4c50703 581a095d50
commit 756ad91368
11 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/gs_guc/cluster_guc.conf
View File

@ -318,6 +318,8 @@ ignore_system_indexes|bool|0,0|NULL|When ignore_system_indexes set to on, it is
sql_ignore_strategy|string|0,0|NULL|NULL|
parctl_min_cost|int|-1,2147483647|NULL|NULL|
io_control_unit|int|1000,1000000|NULL|NULL|
io_limits|int|0,1073741823|NULL|NULL|
io_priority|enum|none,low,medium,high|NULL|NULL|
gin_pending_list_limit|int|64,2147483647|kB|NULL|
intervalstyle|enum|postgres,postgres_verbose,sql_standard,iso_8601,a|NULL|NULL|
join_collapse_limit|int|1,2147483647|NULL|NULL|

1
src/common/backend/utils/misc/guc/guc_security.cpp
View File

@ -1446,4 +1446,3 @@ static bool check_ssl_ciphers(char** newval, void** extra, GucSource)
pfree_ext(ciphers_list);
return true;
}

12
src/gausskernel/process/postmaster/postmaster.cpp
View File

@ -66,6 +66,7 @@
*/
#include "postgres.h"
#include "knl/knl_variable.h"
#include "knl/knl_guc/knl_session_attr_security.h"
#ifdef ENABLE_BBOX
#include "gs_bbox.h"
#endif
@ -3593,6 +3594,16 @@ static void CheckShareStorageConfigConflicts(void)
}
}
static void CheckPasswordLenConfigConflics(void)
{
if (u_sess->attr.attr_security.Password_min_length > u_sess->attr.attr_security.Password_max_length) {
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("password_min_length (%d) should be no more than password_max_length (%d).",
u_sess->attr.attr_security.Password_min_length,
u_sess->attr.attr_security.Password_max_length)));
}
}
/*
* Check for invalid combinations of GUC settings during starting up.
*/
@ -3656,6 +3667,7 @@ static void CheckGUCConflicts(void)
}
CheckExtremeRtoGUCConflicts();
CheckShareStorageConfigConflicts();
CheckPasswordLenConfigConflics();
#if ((defined(USE_SSL)) && (defined(USE_TASSL)))
CheckSSLConflict();
#endif

42
src/test/ha/ha_schedule_single
View File

@ -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

7
src/test/ha/pgxc_psd_single.py
View File

@ -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):

4
src/test/ha/testcase/data_replication_single/datareplica_cstore_big_cu.sh
View File

@ -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 '';"

3
src/test/ha/testcase/data_replication_single/datareplica_cstore_rstore.sh
View File

@ -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';" &

1
src/test/ha/testcase/data_replication_single/datareplica_with_xlogreplica_status.sh
View File

@ -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;"
}

3
src/test/ha/testcase/llt_single/disable_stream_replication.sh
View File

@ -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

4
src/test/ha/testcase/llt_single/xlog_redo.sh
View File

@ -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;"

2
src/test/ha/testcase/pg_rewind_single/failover_copy_col_rewind_standby.sh
View File

@ -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