diff --git a/src/Makefile.global.in b/src/Makefile.global.in index c55db74a3..c706ce137 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1239,9 +1239,6 @@ ifeq ($(enable_libnet), yes) endif override CPPFLAGS := $(CPPFLAGS) -DUSE_SPQ -ifneq ($(wildcard $(top_builddir)/contrib/spq_plugin/.),) -LIBS += -lxerces-c -endif ########################################################################## # diff --git a/src/bin/gs_guc/cluster_guc.conf b/src/bin/gs_guc/cluster_guc.conf index 37cf0eea0..97e8fa805 100755 --- a/src/bin/gs_guc/cluster_guc.conf +++ b/src/bin/gs_guc/cluster_guc.conf @@ -111,8 +111,25 @@ checkpoint_warning|int|0,2147483647|s|NULL| check_implicit_conversions|bool|0,0|NULL|NULL| client_encoding|string|0,0|NULL|It is not recommended to set this parameter in postgresql.conf and it will not take effect even if it is set in postgresql.conf.| client_min_messages|enum|debug,debug5,debug4,debug3,debug2,debug1,log,info,notice,warning,error,fatal,panic|NULL|When client_min_messages and log_min_messages take the same value, the value represented by the different levels.| +comm_ackchk_time|int|0,20000|ms|NULL| cn_send_buffer_size|int|8,128|kB|NULL| comm_proxy_attr|string|0,0|NULL|NULL| +comm_client_bind|bool|0,0|NULL|NULL| +comm_control_port|int|1,65535|NULL|NULL| +comm_debug_mode|bool|0,0|NULL|When comm_debug_mode set to on, printing large amount of log, and it will add extra overhead, reduce database performance. Please Open it only when debugging.| +comm_max_datanode|int|1,8192|NULL|NULL| +comm_max_receiver|int|1,50|NULL|NULL| +comm_max_stream|int|1,60000|NULL|NULL| +comm_no_delay|bool|0,0|NULL|NULL| +comm_quota_size|int|0,2048000|kB|NULL| +comm_sctp_port|int|1,65535|NULL|NULL| +comm_stat_mode|bool|0,0|NULL|When comm_stat_mode set to on, printing large amount of log, and it will add extra overhead, reduce database performance. Please Open it only when debugging.| +comm_tcp_mode|bool|0,0|NULL|If the CN set comm_tcp_mode is off, DN set comm_tcp_mode is on. The cluster can not communicate properly. Please in global configuration mode to set CN and DN, then restart the cluster effect.| +comm_timer_mode|bool|0,0|NULL|When comm_timer_mode set to on, printing large amount of log, and it will add extra overhead, reduce database performance. Please Open it only when debugging.| +comm_usable_memory|int|102400,1073741823|kB|This parameter is required according to the specific configuration and deployment environment memory, over the General Assembly cause OOM, too small will reduce the performance of SCTP communication library.| +comm_memory_pool|int|102400,1073741823|kB|This parameter is the memory pool size for communication.| +comm_memory_pool_percent|int|0,100|NULL|NULL| +comm_sender_buffer_size|int|1,1024|NULL|NULL| commit_delay|int|0,100000|NULL|When you set up a non-zero value after the transaction executed with the commit is not written WAL immediately, while still on the WAL buffer, wait WalWriter process written to disk with periodically. If the system load is high, at the delay time, other transaction maybe have been ready to commit. But if there is no transaction ready to commit, the delay is a waste of time.| commit_siblings|int|0,1000|NULL|NULL| config_file|string|0,0|NULL|NULL| @@ -197,6 +214,7 @@ enable_logical_io_statistics|bool|0,0|NULL|NULL| instance_metric_retention_time|int|0,3650|day|NULL| enable_compress_hll|bool|0,0|NULL|NULL| enable_fast_numeric|bool|0,0|NULL|Enable numeric optimize.| +enable_force_reuse_connections|bool|0,0|NULL|NULL| enable_force_vector_engine|bool|0,0|NULL|NULL| enable_global_plancache|bool|0,0|NULL|NULL| enable_cachedplan_mgr|bool|0,0|NULL|NULL| @@ -228,6 +246,7 @@ enable_prevent_job_task_startup|bool|0,0|NULL|It is not recommended to enable th enable_security_policy|bool|0,0|NULL|NULL| use_elastic_search|bool|0,0|NULL|NULL| elastic_search_ip_addr|string|0,0|NULL|NULL +enable_stateless_pooler_reuse|bool|0,0|NULL|NULL| enable_resource_track|bool|0,0|NULL|NULL| enable_resource_record|bool|0,0|NULL|NULL| enable_roach_standby_cluster|bool|0,0|NULL|NULL| @@ -370,6 +389,7 @@ max_files_per_process|int|25,2147483647|NULL|NULL| max_io_capacity|int|30720,10485760|kB|NULL| max_loaded_cudesc|int|100,1073741823|NULL|NULL| max_locks_per_transaction|int|10,2147483647|NULL|NULL| +max_pool_size|int|1,65535|NULL|max_pool_size should be greater or equal to max_connections| max_pred_locks_per_transaction|int|10,2147483647|NULL|NULL| max_prepared_transactions|int|0,262143|NULL|NULL| max_process_memory|int|2097152,2147483647|kB|NULL| @@ -395,6 +415,7 @@ memory_detail_tracking|string|0,0|NULL|This parameter memory_detail_tracking onl memory_tracking_mode|enum|none,normal,executor,fullexec|NULL|NULL| memory_trace_level|enum|none,level1,level2|NULL|NULL| resilience_memory_reject_percent|string|0,0|NULL|NULL| +minimum_pool_size|int|1,65535|NULL|NULL| modify_initial_password|bool|0,0|NULL|NULL| most_available_sync|bool|0,0|NULL|NULL| ngram_gram_size|int|1,4|NULL|NULL| @@ -422,6 +443,13 @@ password_reuse_max|int|0,1000|NULL|NULL| password_reuse_time|real|0,3650|NULL|Checks the configuration parameters password_reuse_time and password_reuse_max when modifying password, as long as either one, can be considered the password can be reused.| pgxc_node_name|string|0,0|NULL|NULL| plan_mode_seed|int|-1,2147483647|NULL|NULL| +pooler_port|int|1,65535|NULL|NULL| +pooler_timeout|int|0,7200|s|NULL| +pooler_connect_max_loops|int|0,20|NULL|NULL| +pooler_connect_interval_time|int|0,7200|s|NULL| +pooler_connect_timeout|int|0,7200|s|NULL| +pooler_cancel_timeout|int|0,7200|s|NULL| +pooler_maximum_idle_time|int|0,2147483647|s|NULL| port|int|1,65535|NULL|NULL| post_auth_delay|int|0,2147|s|NULL| pre_auth_delay|int|0,60|s|NULL| @@ -472,6 +500,7 @@ show_fdw_remote_plan|bool|0,0|NULL|NULL| skew_option|enum|normal,lazy,off|NULL|NULL| sql_inheritance|bool|0,0|NULL|NULL| ssl|bool|0,0|NULL|NULL| +comm_ssl|bool|0,0|NULL|NULL| ssl_ca_file|string|0,0|NULL|NULL| ssl_cert_file|string|0,0|NULL|NULL| ssl_ciphers|string|0,0|NULL|NULL| @@ -897,6 +926,7 @@ wal_receiver_connect_timeout|int|0,2147483|s|NULL| wal_receiver_connect_retries|int|1,2147483647|NULL|NULL| data_replicate_buffer_size|int|4096,1072693248|kB|NULL| max_connections|int|1,262143|NULL|NULL| +max_coordinators|int|2,1024|NULL|NULL| max_files_per_process|int|25,2147483647|NULL|NULL| shared_buffers|int|16,1073741823|kB|NULL| pca_shared_buffers|int|8,1073741823|kB|NULL| diff --git a/src/gausskernel/CMakeLists.txt b/src/gausskernel/CMakeLists.txt index c17872f3f..21b9e9e44 100755 --- a/src/gausskernel/CMakeLists.txt +++ b/src/gausskernel/CMakeLists.txt @@ -352,13 +352,6 @@ list(APPEND gaussdb_LINK_DIRS ${BOOST_LIB_PATH} ) -list(FIND MACRO_OPTIONS "-DUSE_SPQ" RET_SPQ) -if(NOT ${RET_SPQ} EQUAL -1) - if(EXISTS ${PROJECT_OPENGS_DIR}/contrib/spq_plugin) - list(APPEND gaussdb_LINK_LIBS -lxerces-c) - endif() -endif() - if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") list(APPEND gaussdb_LINK_DIRS ${LIBOBS_LIB_PATH} diff --git a/src/test/regress/output/recovery_2pc_tools.source b/src/test/regress/output/recovery_2pc_tools.source index cc81133c9..0dd8c29b0 100644 --- a/src/test/regress/output/recovery_2pc_tools.source +++ b/src/test/regress/output/recovery_2pc_tools.source @@ -115,9 +115,27 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c codegen_cost_threshold | integer | | 0 | 2147483647 codegen_strategy | enum | | | collation_connection | string | | | + comm_ackchk_time | integer | ms | 0 | 20000 + comm_client_bind | bool | | | + comm_control_port | integer | | 1 | 65535 + comm_debug_mode | bool | | | commit_delay | integer | | 0 | 100000 commit_siblings | integer | | 0 | 1000 + comm_max_datanode | integer | | 1 | 8192 + comm_max_receiver | integer | | 1 | 50 + comm_max_stream | integer | | 1 | 60000 + comm_memory_pool | integer | kB | 102400 | 1073741823 + comm_memory_pool_percent | integer | | 0 | 100 + comm_no_delay | bool | | | comm_proxy_attr | string | | | + comm_quota_size | integer | kB | 0 | 2048000 + comm_sctp_port | integer | | 1 | 65535 + comm_sender_buffer_size | integer | | 1 | 1024 + comm_ssl | bool | | | + comm_stat_mode | bool | | | + comm_tcp_mode | bool | | | + comm_timer_mode | bool | | | + comm_usable_memory | integer | kB | 102400 | 1073741823 config_file | string | | | connection_alarm_rate | real | | 0 | 1 connection_info | string | | | @@ -261,6 +279,7 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c enable_fast_allocate | bool | | | enable_fast_numeric | bool | | | enable_ffic_log | bool | | | + enable_force_reuse_connections | bool | | | enable_force_vector_engine | bool | | | enable_functional_dependency | bool | | | enable_global_plancache | bool | | | @@ -328,6 +347,7 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c enable_sortgroup_agg | bool | | | ss_enable_dorado | bool | | | enable_startwith_debug | bool | | | + enable_stateless_pooler_reuse | bool | | | enable_stmt_track | bool | | | enable_stream_replication | bool | | | enable_tde | bool | | | @@ -467,6 +487,7 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c max_compile_functions | integer | | 1 | 2147483647 max_concurrent_autonomous_transactions | integer | | 0 | 1024 max_connections | integer | | 10 | 262143 + max_coordinators | integer | | 2 | 1024 max_error_count | integer | | 0 | 65535 max_files_per_process | integer | | 25 | 2147483647 max_function_args | integer | | 8192 | 8192 @@ -478,6 +499,7 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c max_loaded_cudesc | integer | | 100 | 1073741823 max_locks_per_transaction | integer | | 10 | 2147483647 max_logical_replication_workers | integer | | 0 | 262143 + max_pool_size | integer | | 1 | 65535 max_pred_locks_per_transaction | integer | | 10 | 2147483647 max_prepared_transactions | integer | | 0 | 262143 max_process_memory | integer | kB | 2097152 | 2147483647 @@ -501,6 +523,7 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c memorypool_size | integer | kB | 131072 | 1073741823 memory_trace_level | enum | | | memory_tracking_mode | enum | | | + minimum_pool_size | integer | | 1 | 65535 modify_initial_password | bool | | | most_available_sync | bool | | | multi_stats_type | enum | | | @@ -549,6 +572,13 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c plog_merge_age | integer | ms | 0 | 2147483647 plsql_compile_check_options | string | | | plsql_show_all_error | bool | | | + pooler_cancel_timeout | integer | s | 0 | 7200 + pooler_connect_interval_time | integer | s | 0 | 7200 + pooler_connect_max_loops | integer | | 0 | 20 + pooler_connect_timeout | integer | s | 0 | 7200 + pooler_maximum_idle_time | integer | s | 0 | 2147483647 + pooler_port | integer | | 1 | 65535 + pooler_timeout | integer | s | 0 | 7200 port | integer | | 1 | 65535 post_auth_delay | integer | s | 0 | 2147 pre_auth_delay | integer | s | 0 | 60 diff --git a/src/test/regress/pg_regress.cpp b/src/test/regress/pg_regress.cpp index 3094ffb53..d48e94967 100644 --- a/src/test/regress/pg_regress.cpp +++ b/src/test/regress/pg_regress.cpp @@ -1451,8 +1451,8 @@ static void start_ss_node(int i) port_number, temp_install, data_folder, - port_number + 10, - port_number + 20, + port_number + 30, + port_number + 40, hostname ? hostname : "*", outputdir, data_folder); diff --git a/src/test/ss/build_ss_database_common.sh b/src/test/ss/build_ss_database_common.sh index 7f0ea52fd..c060ce0ff 100644 --- a/src/test/ss/build_ss_database_common.sh +++ b/src/test/ss/build_ss_database_common.sh @@ -108,8 +108,8 @@ set_gaussdb_port() pg_port=$2 echo "" >> ${data_node}/postgresql.conf echo "port = ${pg_port}" >> ${data_node}/postgresql.conf - echo "comm_sctp_port = $((pg_port + 10))" >> ${data_node}/postgresql.conf - echo "comm_control_port = $((pg_port + 20))" >> ${data_node}/postgresql.conf + echo "comm_sctp_port = $((pg_port + 30))" >> ${data_node}/postgresql.conf + echo "comm_control_port = $((pg_port + 40))" >> ${data_node}/postgresql.conf } start_gaussdb()