From 70e57dac62946cc5438255c450378b8888257f03 Mon Sep 17 00:00:00 2001 From: "arcoalien@qq.com" Date: Sat, 29 Jun 2024 16:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B5=81=E6=8E=A7=E7=89=B9?= =?UTF-8?q?=E6=80=A7=E7=9A=84=E9=83=A8=E5=88=86=E6=97=A5=E5=BF=97=E7=9A=84?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=8E=A7=E5=88=B6=EF=BC=8C=E4=BD=BF=E5=BE=97?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0=E4=B8=8B=E4=B9=9F=E8=83=BD?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=B5=81=E6=8E=A7=E7=9B=B8=E5=85=B3=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=96=B9=E4=BE=BF=E9=97=AE=E9=A2=98=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/replication/walsender.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/gausskernel/storage/replication/walsender.cpp b/src/gausskernel/storage/replication/walsender.cpp index ab0747f98..a0f17456e 100755 --- a/src/gausskernel/storage/replication/walsender.cpp +++ b/src/gausskernel/storage/replication/walsender.cpp @@ -2813,8 +2813,7 @@ static void ProcessTargetRtoRpoChanged() if (g_instance.rto_cxt.rto_standby_data[walsnd->index].target_rto != u_sess->attr.attr_storage.hadr_recovery_time_target) { - ereport(LOG, (errmodule(MOD_RTO_RPO), - errmsg("hadr_target_rto changes to %d, previous target_rto is %d, " + ereport(LOG, (errmsg("hadr_target_rto changes to %d, previous target_rto is %d, " "current the sleep time is %ld", u_sess->attr.attr_storage.hadr_recovery_time_target, g_instance.rto_cxt.rto_standby_data[walsnd->index].target_rto, @@ -2832,8 +2831,7 @@ static void ProcessTargetRtoRpoChanged() } if (g_instance.rto_cxt.rto_standby_data[walsnd->index].target_rto != u_sess->attr.attr_storage.target_rto) { - ereport(LOG, (errmodule(MOD_RTO_RPO), - errmsg("target_rto changes to %d, previous target_rto is %d, current the sleep time is %ld", + ereport(LOG, (errmsg("target_rto changes to %d, previous target_rto is %d, current the sleep time is %ld", u_sess->attr.attr_storage.target_rto, g_instance.rto_cxt.rto_standby_data[walsnd->index].target_rto, g_instance.rto_cxt.rto_standby_data[walsnd->index].current_sleep_time))); @@ -3567,15 +3565,13 @@ static void LogCtrlCalculateSleepTime(int64 logCtrlSleepTime, int64 balanceSleep if (pre_time == 0 && logCtrlSleepTime != 0) { if (isHadrRPO) { ereport(LOG, - (errmodule(MOD_RTO_RPO), - errmsg("Log control take effect due to RPO, target_rpo is %d, current_rpo is %ld, " + (errmsg("Log control take effect due to RPO, target_rpo is %d, current_rpo is %ld, " "current the sleep time is %ld microseconds", u_sess->attr.attr_storage.hadr_recovery_point_target, walsnd->log_ctrl.current_RPO, logCtrlSleepTime))); } else { ereport(LOG, - (errmodule(MOD_RTO_RPO), - errmsg("Log control take effect due to RTO, target_rto is %d, current_rto is %ld, " + (errmsg("Log control take effect due to RTO, target_rto is %d, current_rto is %ld, " "current the sleep time is %ld microseconds", targetRTO, walsnd->log_ctrl.current_RTO, logCtrlSleepTime))); } @@ -3584,15 +3580,13 @@ static void LogCtrlCalculateSleepTime(int64 logCtrlSleepTime, int64 balanceSleep if (pre_time != 0 && logCtrlSleepTime == 0) { if (isHadrRPO) { ereport(LOG, - (errmodule(MOD_RTO_RPO), - errmsg("Log control does not take effect due to RPO, target_rpo is %d, current_rpo is %ld, " + (errmsg("Log control does not take effect due to RPO, target_rpo is %d, current_rpo is %ld, " "current the sleep time is %ld microseconds", u_sess->attr.attr_storage.hadr_recovery_point_target, walsnd->log_ctrl.current_RPO, logCtrlSleepTime))); } else { ereport(LOG, - (errmodule(MOD_RTO_RPO), - errmsg("Log control does not take effect because of RTO, target_rto is %d, current_rto is %ld, " + (errmsg("Log control does not take effect because of RTO, target_rto is %d, current_rto is %ld, " "current the sleep time is %ld microseconds", targetRTO, walsnd->log_ctrl.current_RTO, logCtrlSleepTime))); }