From 548b83b18d185f11399205a7a220560914f20ea9 Mon Sep 17 00:00:00 2001
From: z00848344 <zhangyuemeng2@huawei.com>
Date: Thu, 20 Jun 2024 11:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E4=BD=8Epg=E6=97=A5=E5=BF=97=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=E7=9B=98=E6=BB=A1?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=A2=91=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gausskernel/process/postmaster/pgaudit.cpp | 16 ++++++++++++++--
 src/test/regress/pg_regress.cpp                |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/gausskernel/process/postmaster/pgaudit.cpp b/src/gausskernel/process/postmaster/pgaudit.cpp
index dde6cc4d0..f223a4283 100755
--- a/src/gausskernel/process/postmaster/pgaudit.cpp
+++ b/src/gausskernel/process/postmaster/pgaudit.cpp
@@ -1094,6 +1094,7 @@ static void pgaudit_write_file(char* buffer, int count)
         }
     }
 
+    uint32 retry_cnt = 0;
 retry1:
     rc = fwrite(buffer, 1, count, t_thrd.audit.sysauditFile);
 
@@ -1103,8 +1104,13 @@ retry1:
          * there is not space to write.
          */
         if (errno == ENOSPC) {
-            ereport(WARNING, (errmsg("No free space left on audit disk.")));
             pg_usleep(1000000);
+            /* Report no space warning every 30s. */
+            if (retry_cnt % 30 == 0) {
+                ereport(WARNING, (errmsg("No free space left on audit disk.")));
+                retry_cnt = 0;
+            }
+            retry_cnt += 1;
             goto retry1;
         }
         ereport(ERROR, (errcode_for_file_access(), errmsg("could not write to audit file: %m")));
@@ -1130,6 +1136,7 @@ static void pgaudit_write_policy_audit_file(const char* buffer, int count)
         return;
     }
 /* temporary duble writing to policy auditing file */
+    uint32 retry_cnt = 0;
 retry:
     int rc = fwrite(buffer, 1, count, t_thrd.audit.policyauditFile);
     if (rc != count) {
@@ -1138,8 +1145,13 @@ retry:
          * there is not space to write.
          */
         if (errno == ENOSPC) {
-            ereport(WARNING, (errmsg("No free space left on audit disk.")));
             pg_usleep(1000000);
+            /* Report no space warning every 30s. */
+            if (retry_cnt % 30 == 0) {
+                ereport(WARNING, (errmsg("No free space left on audit disk.")));
+                retry_cnt = 0;
+            }
+            retry_cnt += 1;
             goto retry;
         }
     }
diff --git a/src/test/regress/pg_regress.cpp b/src/test/regress/pg_regress.cpp
index 926e982b7..4baab58dd 100644
--- a/src/test/regress/pg_regress.cpp
+++ b/src/test/regress/pg_regress.cpp
@@ -5517,7 +5517,7 @@ static void check_global_variables()
     }
 }
 
-#define BASE_PGXC_LIKE_MACRO_NUM 1386
+#define BASE_PGXC_LIKE_MACRO_NUM 1384
 static void check_pgxc_like_macros()
 {
 #ifdef BUILD_BY_CMAKE