From 19045d93addf28077654b88457abe981dcaad441 Mon Sep 17 00:00:00 2001 From: muyulinzhong Date: Fri, 8 Mar 2024 14:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bugfix=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=9B=86=E7=BE=A4reform=E5=A4=B1=E8=B4=A5=E6=9C=89=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E4=BC=9A=E5=8D=A1=E5=9C=A8starting=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bin/gs_guc/cluster_guc.conf | 4 ++-- src/bin/gs_guc/cluster_guc.cpp | 2 ++ src/gausskernel/process/postmaster/checkpointer.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/gs_guc/cluster_guc.conf b/src/bin/gs_guc/cluster_guc.conf index bb0beef62..f9d5329d9 100755 --- a/src/bin/gs_guc/cluster_guc.conf +++ b/src/bin/gs_guc/cluster_guc.conf @@ -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| diff --git a/src/bin/gs_guc/cluster_guc.cpp b/src/bin/gs_guc/cluster_guc.cpp index 31499ee4f..5e546e6bd 100644 --- a/src/bin/gs_guc/cluster_guc.cpp +++ b/src/bin/gs_guc/cluster_guc.cpp @@ -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 diff --git a/src/gausskernel/process/postmaster/checkpointer.cpp b/src/gausskernel/process/postmaster/checkpointer.cpp index 993a57943..4d8b765ff 100755 --- a/src/gausskernel/process/postmaster/checkpointer.cpp +++ b/src/gausskernel/process/postmaster/checkpointer.cpp @@ -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