From 3b07a0cd066e0a224f440e43e2185d40461145ba Mon Sep 17 00:00:00 2001 From: laishenghao Date: Sat, 10 Jun 2023 15:20:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BB=BA=E5=A4=87=E6=9C=BA=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=88=A0=E9=99=A4=E8=A6=86=E7=9B=96=20postgresql.conf?= =?UTF-8?q?.bak=20=E4=B8=8E=20postgresql.conf.guc.bak=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bin/pg_ctl/pg_build.cpp | 1 + src/gausskernel/storage/replication/basebackup.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/bin/pg_ctl/pg_build.cpp b/src/bin/pg_ctl/pg_build.cpp index 6e730eb4f5..4383c62f49 100755 --- a/src/bin/pg_ctl/pg_build.cpp +++ b/src/bin/pg_ctl/pg_build.cpp @@ -1433,6 +1433,7 @@ static void DeleteSubDataDir(const char* dirname) } else if (S_ISREG(st.st_mode)) { if (strcmp(de->d_name, "postgresql.conf") == 0 || strcmp(de->d_name, "pg_ctl.lock") == 0 || strcmp(de->d_name, "postgresql.conf.lock") == 0 || strcmp(de->d_name, "postgresql.conf.bak.old") == 0 || + strcmp(de->d_name, "postgresql.conf.bak") == 0 || strcmp(de->d_name, "postgresql.conf.guc.bak") == 0 || strcmp(de->d_name, "build_completed.start") == 0 || strcmp(de->d_name, "gs_build.pid") == 0 || strcmp(de->d_name, "postmaster.opts") == 0 || strcmp(de->d_name, "gaussdb.state") == 0 || strcmp(de->d_name, "disc_readonly_test") == 0 || strcmp(de->d_name, ssl_cert_file) == 0 || diff --git a/src/gausskernel/storage/replication/basebackup.cpp b/src/gausskernel/storage/replication/basebackup.cpp index 4314a91a8e..18d7720f9a 100755 --- a/src/gausskernel/storage/replication/basebackup.cpp +++ b/src/gausskernel/storage/replication/basebackup.cpp @@ -1433,6 +1433,7 @@ static int64 sendDir(const char *path, int basepathlen, bool sizeonly, List *tab /* For gs_backup, we should not skip these files */ if (strcmp(pathbuf, "./pg_ctl.lock") == 0 || strcmp(pathbuf, "./postgresql.conf.lock") == 0 || strcmp(pathbuf, "./postgresql.conf.bak") == 0 || strcmp(pathbuf, "./postgresql.conf") == 0 || + strcmp(de->d_name, "postgresql.conf.guc.bak") == 0 || strcmp(pathbuf, "./postgresql.conf.bak.old") == 0) { continue; } -- Gitee