From dc42da4a450f266ed6b9b7143dfb78d04798d200 Mon Sep 17 00:00:00 2001 From: hemny Date: Thu, 14 Sep 2023 19:49:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=BC=80dms=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8F=AA=E8=83=BD=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=AE=B5=E9=A1=B5=E5=BC=8F=E5=AD=98=E5=82=A8=EF=BC=8C=E5=BC=80?= =?UTF-8?q?=E6=94=BErelease=E7=89=88=E6=9C=AC=E7=9A=84enable=5Fsegment?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8F=AF=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E6=98=93=E7=94=A8=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bin/gs_guc/cluster_guc.conf | 1 + src/bin/initdb/initdb.cpp | 4 ++++ src/common/backend/utils/misc/guc/guc_storage.cpp | 3 +-- src/common/backend/utils/misc/postgresql_single.conf.sample | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/bin/gs_guc/cluster_guc.conf b/src/bin/gs_guc/cluster_guc.conf index b52f72f7f3..c6bab6b13a 100755 --- a/src/bin/gs_guc/cluster_guc.conf +++ b/src/bin/gs_guc/cluster_guc.conf @@ -727,6 +727,7 @@ logical_sender_timeout|int|0,2147483647|ms|NULL| var_eq_const_selectivity|bool|0,0|NULL|NULL| enable_save_confirmed_lsn|bool|0,0|NULL|NULL| ss_enable_dss|bool|0,0|NULL|NULL| +enable_segment|bool|0,0|NULL|NULL| ss_dss_vg_name|string|0,0|NULL|NULL| ss_dss_conn_path|string|0,0|NULL|NULL| ss_enable_dms|bool|0,0|NULL|NULL| diff --git a/src/bin/initdb/initdb.cpp b/src/bin/initdb/initdb.cpp index 75d5e6bcf6..676432793e 100644 --- a/src/bin/initdb/initdb.cpp +++ b/src/bin/initdb/initdb.cpp @@ -1593,6 +1593,10 @@ static void setup_config(void) securec_check_c(nRet, "\0", "\0"); conflines = replace_token(conflines, "#ss_enable_dss = off", repltok); + nRet = strcpy_s(repltok, sizeof(repltok), "enable_segment = on"); + securec_check_c(nRet, "\0", "\0"); + conflines = replace_token(conflines, "#enable_segment = off", repltok); + conflines = ss_addnodeparmater(conflines); } diff --git a/src/common/backend/utils/misc/guc/guc_storage.cpp b/src/common/backend/utils/misc/guc/guc_storage.cpp index f8f7b9ee18..e00f1d1abe 100755 --- a/src/common/backend/utils/misc/guc/guc_storage.cpp +++ b/src/common/backend/utils/misc/guc/guc_storage.cpp @@ -956,7 +956,6 @@ static void InitStorageConfigureNamesBool() NULL, NULL}, -#ifdef USE_ASSERT_CHECKING {{"enable_segment", PGC_SIGHUP, NODE_ALL, @@ -968,7 +967,7 @@ static void InitStorageConfigureNamesBool() NULL, NULL, NULL}, -#endif + {{"enable_gtm_free", PGC_POSTMASTER, NODE_DISTRIBUTE, diff --git a/src/common/backend/utils/misc/postgresql_single.conf.sample b/src/common/backend/utils/misc/postgresql_single.conf.sample index 3b1eeb20a6..3e78fabea8 100644 --- a/src/common/backend/utils/misc/postgresql_single.conf.sample +++ b/src/common/backend/utils/misc/postgresql_single.conf.sample @@ -852,3 +852,4 @@ job_queue_processes = 10 # Number of concurrent jobs, optional: [0..1000] #ss_enable_ondemand_recovery = off #ss_ondemand_recovery_mem_size = 4GB # min: 1GB, max: 100GB #enable_ss_dorado = off +#enable_segment = off -- Gitee