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

!4925 修复：failover过程中，集群卡在starting状态，备1启动轮reform失败，应该退出，但是未退出

Browse Source 
Merge pull request !4925 from songlinxuan/master
This commit is contained in:
opengauss_bot
2024-03-08 06:38:33 +00:00
committed by Gitee
parent e3e462d059 19045d93ad
commit 66fd5f8347
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,8 +251,8 @@ enable_show_any_tuples|bool|0,0|NULL|NULL|
enable_sort|bool|0,0|NULL|NULL|
enable_incremental_catchup|bool|0,0|NULL|NULL|
wait_dummy_time|int|1,2147483647|NULL|NULL|
heap_bulk_read_size|int|0,512|kB|Bulk blocks number for seqscan pre-read.|
vacuum_bulk_read_size|int|0,512|kB|Bulk blocks number for vacuum pre-read.|
heap_bulk_read_size|int|0,64|kB|Bulk blocks number for seqscan pre-read.|
vacuum_bulk_read_size|int|0,64|kB|Bulk blocks number for vacuum pre-read.|
max_active_global_temporary_table|int|0,1000000|NULL|NULL|
max_inner_tool_connections|int|1,0x3FFFF|NULL|NULL|
max_recursive_times|int|0,2147483647|NULL|NULL|

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

@ -279,6 +279,8 @@ const char* unit_eight_kB_parameter_list[] = {
"wal_buffers",
"wal_segment_size",
"huge_page_size",
"heap_bulk_read_size",
"vacuum_bulk_read_size"
};
/* the size of page, unit is kB */
#define PAGE_SIZE 8

2
src/gausskernel/process/postmaster/checkpointer.cpp
View File

@ -425,7 +425,7 @@ void CheckpointerMain(void)
u_sess->stat_cxt.BgWriterStats->m_requested_checkpoints++;
}
if (t_thrd.checkpoint_cxt.shutdown_requested) {
if (t_thrd.checkpoint_cxt.shutdown_requested || pmState == PM_SHUTDOWN) {
/*
* From here on, elog(ERROR) should end with exit(1), not send
* control back to the sigsetjmp block above