From 9a62282a48e1487f32ad91ea6d664cd409d10be4 Mon Sep 17 00:00:00 2001 From: gentle_hu Date: Sat, 3 Jun 2023 17:15:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dalarm=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=95=B0=E6=AF=94=E7=8E=87=E6=97=A0=E6=95=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/storage/lmgr/proc.cpp | 4 ++-- src/test/regress/pg_regress.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gausskernel/storage/lmgr/proc.cpp b/src/gausskernel/storage/lmgr/proc.cpp index 8247a230a..8611e39ed 100755 --- a/src/gausskernel/storage/lmgr/proc.cpp +++ b/src/gausskernel/storage/lmgr/proc.cpp @@ -3198,14 +3198,14 @@ TimestampTz GetStatementFinTime() AlarmCheckResult ConnectionOverloadChecker(Alarm* alarm, AlarmAdditionalParam* additionalParam) { -#ifdef PGXC +#ifdef ENABLE_MULTIPLE_NODES if (!IS_PGXC_COORDINATOR) { return ALM_ACR_UnKnown; } #endif int connectionLimit = - int(u_sess->attr.attr_common.ConnectionAlarmRate * g_instance.shmem_cxt.MaxConnections); + int(u_sess->attr.attr_common.ConnectionAlarmRate * g_instance.attr.attr_network.MaxConnections); SpinLockAcquire(&g_instance.conn_cxt.ConnCountLock); int currentConnections = g_instance.conn_cxt.CurConnCount; SpinLockRelease(&g_instance.conn_cxt.ConnCountLock); diff --git a/src/test/regress/pg_regress.cpp b/src/test/regress/pg_regress.cpp index 057558488..db1f0b4ac 100644 --- a/src/test/regress/pg_regress.cpp +++ b/src/test/regress/pg_regress.cpp @@ -5461,7 +5461,7 @@ static void check_global_variables() } } -#define BASE_PGXC_LIKE_MACRO_NUM 1393 +#define BASE_PGXC_LIKE_MACRO_NUM 1392 static void check_pgxc_like_macros() { #ifdef BUILD_BY_CMAKE