From 316e713fb6528fcf80ff9c1655596b524012c5be Mon Sep 17 00:00:00 2001 From: Rade_He Date: Tue, 12 Dec 2023 16:09:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20bug=20GUC=E5=8F=82=E6=95=B0=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=BD=BF=E5=A4=87=E6=9C=BA=E5=85=B3=E9=97=ADCBM?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/process/postmaster/postmaster.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gausskernel/process/postmaster/postmaster.cpp b/src/gausskernel/process/postmaster/postmaster.cpp index bc190a7c44..3b153e4ffd 100644 --- a/src/gausskernel/process/postmaster/postmaster.cpp +++ b/src/gausskernel/process/postmaster/postmaster.cpp @@ -4170,7 +4170,7 @@ static int ServerLoop(void) * let cbm writer thread exit if enable_cbm_track gus is switched off */ if (!u_sess->attr.attr_storage.enable_cbm_tracking && g_instance.pid_cxt.CBMWriterPID != 0 && - pmState == PM_RUN) { + (pmState == PM_RUN || pmState == PM_HOT_STANDBY || pmState == PM_RECOVERY)) { ereport(LOG, (errmsg("stop cbm writer thread because enable_cbm_tracking is switched off, " "cbm writer thread pid=%lu", -- Gitee From 178927a7016a62f4fe9ef7cefbb2d8f4eb2e6eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E6=96=87=E5=81=A5?= <942801794@qq.com> Date: Tue, 25 Jun 2024 17:58:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20bug=20#I9P3QO=20#5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dgs=5Fxlog=5Fkeepers=E5=87=BD=E6=95=B0=E5=9C=A8?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=89=8D=E5=90=8E=E5=9C=A8pg=5Fproc=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=90=8C=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/backend/catalog/builtin_funcs.ini | 2 +- .../upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql | 2 +- .../upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/backend/catalog/builtin_funcs.ini b/src/common/backend/catalog/builtin_funcs.ini index 090b85da6b..479f07e1bc 100644 --- a/src/common/backend/catalog/builtin_funcs.ini +++ b/src/common/backend/catalog/builtin_funcs.ini @@ -3681,7 +3681,7 @@ ), AddFuncGroup( "gs_xlog_keepers", 1, - AddBuiltinFunc(_0(9040), _1("gs_xlog_keepers"), _2(0), _3(true), _4(false), _5(gs_xlog_keepers), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('s'), _19(0), _20(0), _21(3, 25, 25, 25), _22(3, 'o', 'o', 'o'), _23(3, "keeptype", "keepsegment", "describe"), _24(NULL), _25("gs_xlog_keepers"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33(NULL), _34('f')) + AddBuiltinFunc(_0(9040), _1("gs_xlog_keepers"), _2(0), _3(true), _4(true), _5(gs_xlog_keepers), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(1000), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('v'), _19(0), _20(0), _21(3, 25, 25, 25), _22(3, 'o', 'o', 'o'), _23(3, "keeptype", "keepsegment", "describe"), _24(NULL), _25("gs_xlog_keepers"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(false), _32(false), _33(NULL), _34('f')) ), AddFuncGroup( "gs_get_next_xid_csn", 1, diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql index 55eb9fe8af..3caae90717 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql @@ -179,4 +179,4 @@ CREATE OR REPLACE FUNCTION pg_catalog.gs_xlog_keepers (out keeptype pg_catalog.text, out keepsegment pg_catalog.text, out describe pg_catalog.text) -RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers'; \ No newline at end of file +RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT ROWS 1000 NOT SHIPPABLE as 'gs_xlog_keepers'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql index 55eb9fe8af..3caae90717 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql @@ -179,4 +179,4 @@ CREATE OR REPLACE FUNCTION pg_catalog.gs_xlog_keepers (out keeptype pg_catalog.text, out keepsegment pg_catalog.text, out describe pg_catalog.text) -RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers'; \ No newline at end of file +RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT ROWS 1000 NOT SHIPPABLE as 'gs_xlog_keepers'; \ No newline at end of file -- Gitee From 1dfa3a9c354f2cef2b3631c081a1a353a9e8b467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E6=96=87=E5=81=A5?= Date: Tue, 25 Jun 2024 10:35:00 +0000 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"fix=20bug=20#I9P3QO=20#5=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgs=5Fxlog=5Fkeepers=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E5=9C=A8=E5=8D=87=E7=BA=A7=E5=89=8D=E5=90=8E=E5=9C=A8pg=5Fproc?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=90=8C=E7=9A=84bug"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 178927a7016a62f4fe9ef7cefbb2d8f4eb2e6eec. --- src/common/backend/catalog/builtin_funcs.ini | 2 +- .../upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql | 2 +- .../upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/backend/catalog/builtin_funcs.ini b/src/common/backend/catalog/builtin_funcs.ini index 479f07e1bc..090b85da6b 100644 --- a/src/common/backend/catalog/builtin_funcs.ini +++ b/src/common/backend/catalog/builtin_funcs.ini @@ -3681,7 +3681,7 @@ ), AddFuncGroup( "gs_xlog_keepers", 1, - AddBuiltinFunc(_0(9040), _1("gs_xlog_keepers"), _2(0), _3(true), _4(true), _5(gs_xlog_keepers), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(1000), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('v'), _19(0), _20(0), _21(3, 25, 25, 25), _22(3, 'o', 'o', 'o'), _23(3, "keeptype", "keepsegment", "describe"), _24(NULL), _25("gs_xlog_keepers"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(false), _32(false), _33(NULL), _34('f')) + AddBuiltinFunc(_0(9040), _1("gs_xlog_keepers"), _2(0), _3(true), _4(false), _5(gs_xlog_keepers), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('s'), _19(0), _20(0), _21(3, 25, 25, 25), _22(3, 'o', 'o', 'o'), _23(3, "keeptype", "keepsegment", "describe"), _24(NULL), _25("gs_xlog_keepers"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33(NULL), _34('f')) ), AddFuncGroup( "gs_get_next_xid_csn", 1, diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql index 3caae90717..55eb9fe8af 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_846.sql @@ -179,4 +179,4 @@ CREATE OR REPLACE FUNCTION pg_catalog.gs_xlog_keepers (out keeptype pg_catalog.text, out keepsegment pg_catalog.text, out describe pg_catalog.text) -RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT ROWS 1000 NOT SHIPPABLE as 'gs_xlog_keepers'; \ No newline at end of file +RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql index 3caae90717..55eb9fe8af 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_846.sql @@ -179,4 +179,4 @@ CREATE OR REPLACE FUNCTION pg_catalog.gs_xlog_keepers (out keeptype pg_catalog.text, out keepsegment pg_catalog.text, out describe pg_catalog.text) -RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT ROWS 1000 NOT SHIPPABLE as 'gs_xlog_keepers'; \ No newline at end of file +RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers'; \ No newline at end of file -- Gitee