public inbox for [email protected]
help / color / mirror / Atom feedFrom: Peter Eisentraut <[email protected]>
To: Robert Haas <[email protected]>
To: Jakub Wartak <[email protected]>
Cc: Alvaro Herrera <[email protected]>
Cc: Andres Freund <[email protected]>
Cc: Dilip Kumar <[email protected]>
Cc: [email protected] <[email protected]>
Subject: Re: trying again to get incremental backup
Date: Fri, 15 Dec 2023 12:53:40 +0100
Message-ID: <[email protected]> (raw)
In-Reply-To: <CA+TgmoYUhrgcNin=qrY+J+S-f6kctf9DaUKoaD-e3cww_ox9vg@mail.gmail.com>
References: <CA+TgmoYiPn7GE_GFvGf+150XOt-Pkdm8h4rzy42jYCRrceUWhg@mail.gmail.com>
<[email protected]>
<CA+TgmoafkMay-O7KFyxwYxaT5pZ+ku+qM8hLM88ZzEyq2g-LtQ@mail.gmail.com>
<CAKZiRmys4AbHJOg2NAqGgjzmHC5CvA3JUHYAaQSG_turxccMFw@mail.gmail.com>
<CA+TgmoYuC27_ToGtTTNyHgpn_eJmdqrmhJ93bAbinkBtXsWHaA@mail.gmail.com>
<CA+Tgmob7CFCv99_bCRB=pWYat6r2rhgSqiEWQPJO67ywcb0Hpw@mail.gmail.com>
<CA+TgmoZpBW2DHeeC--y0H3y1RGsUHb14vinZU4yqBAHtWgv-vg@mail.gmail.com>
<CA+TgmoaiOhjd0pL630MSpZ_fyjFsARFC8RDBWxWL2FXPv65bJA@mail.gmail.com>
<CAKZiRmxGN4Eu90xOt8cJwgjV67jNSFsA6Lc_1bgCT5KR-5ywJA@mail.gmail.com>
<CA+Tgmob4VFT6CuVaxwO0JjLrmCoHF+NNm_f1LsCeSi5i82MeSA@mail.gmail.com>
<CAKZiRmy73EKi3i5mdtcjn6r6WWQfKuri3HSQ+Pmdu_7g5Ef5kA@mail.gmail.com>
<CA+TgmoYUhrgcNin=qrY+J+S-f6kctf9DaUKoaD-e3cww_ox9vg@mail.gmail.com>
I have a couple of quick fixes here.
The first fixes up some things in nls.mk related to a file move. The
second is some cleanup because some function you are using has been
removed in the meantime; you probably found that yourself while rebasing.
The pg_walsummary patch doesn't have a nls.mk, but you also comment that
it doesn't have tests yet, so I assume it's not considered complete yet
anyway.
From 04aae4ee91ddd1d4ce061c36a99b0fa18bdd98ec Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Thu, 14 Dec 2023 12:50:33 +0100
Subject: [PATCH 2/6] fixup! Move src/bin/pg_verifybackup/parse_manifest.c into
src/common.
---
src/bin/pg_verifybackup/nls.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/pg_verifybackup/nls.mk b/src/bin/pg_verifybackup/nls.mk
index eba73a2c05..9e6a6049ba 100644
--- a/src/bin/pg_verifybackup/nls.mk
+++ b/src/bin/pg_verifybackup/nls.mk
@@ -1,10 +1,10 @@
# src/bin/pg_verifybackup/nls.mk
CATALOG_NAME = pg_verifybackup
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
- parse_manifest.c \
pg_verifybackup.c \
../../common/fe_memutils.c \
- ../../common/jsonapi.c
+ ../../common/jsonapi.c \
+ ../../common/parse_manifest.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
json_manifest_parse_failure:2 \
error_cb:2 \
--
2.43.0
From 25211044687a629e632ef0a2bfad30acea337266 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Thu, 14 Dec 2023 18:32:29 +0100
Subject: [PATCH 4/6] fixup! Add a new WAL summarizer process.
---
src/backend/backup/meson.build | 2 +-
src/backend/postmaster/walsummarizer.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/backend/backup/meson.build b/src/backend/backup/meson.build
index 0e2de91e9f..5d4ebe3ebe 100644
--- a/src/backend/backup/meson.build
+++ b/src/backend/backup/meson.build
@@ -13,5 +13,5 @@ backend_sources += files(
'basebackup_throttle.c',
'basebackup_zstd.c',
'walsummary.c',
- 'walsummaryfuncs.c'
+ 'walsummaryfuncs.c',
)
diff --git a/src/backend/postmaster/walsummarizer.c b/src/backend/postmaster/walsummarizer.c
index 7c840c36b3..9fa155349e 100644
--- a/src/backend/postmaster/walsummarizer.c
+++ b/src/backend/postmaster/walsummarizer.c
@@ -290,7 +290,7 @@ WalSummarizerMain(void)
FlushErrorState();
/* Flush any leaked data in the top-level context */
- MemoryContextResetAndDeleteChildren(context);
+ MemoryContextReset(context);
/* Now we can allow interrupts again */
RESUME_INTERRUPTS();
@@ -342,7 +342,7 @@ WalSummarizerMain(void)
XLogRecPtr end_of_summary_lsn;
/* Flush any leaked data in the top-level context */
- MemoryContextResetAndDeleteChildren(context);
+ MemoryContextReset(context);
/* Process any signals received recently. */
HandleWalSummarizerInterrupts();
--
2.43.0
Attachments:
[text/plain] 0002-fixup-Move-src-bin-pg_verifybackup-parse_man.patch.nocfbot (1.1K, ../[email protected]/2-0002-fixup-Move-src-bin-pg_verifybackup-parse_man.patch.nocfbot)
download | inline diff:
From 04aae4ee91ddd1d4ce061c36a99b0fa18bdd98ec Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Thu, 14 Dec 2023 12:50:33 +0100
Subject: [PATCH 2/6] fixup! Move src/bin/pg_verifybackup/parse_manifest.c into
src/common.
---
src/bin/pg_verifybackup/nls.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/pg_verifybackup/nls.mk b/src/bin/pg_verifybackup/nls.mk
index eba73a2c05..9e6a6049ba 100644
--- a/src/bin/pg_verifybackup/nls.mk
+++ b/src/bin/pg_verifybackup/nls.mk
@@ -1,10 +1,10 @@
# src/bin/pg_verifybackup/nls.mk
CATALOG_NAME = pg_verifybackup
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
- parse_manifest.c \
pg_verifybackup.c \
../../common/fe_memutils.c \
- ../../common/jsonapi.c
+ ../../common/jsonapi.c \
+ ../../common/parse_manifest.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
json_manifest_parse_failure:2 \
error_cb:2 \
--
2.43.0
[text/plain] 0004-fixup-Add-a-new-WAL-summarizer-process.patch.nocfbot (1.5K, ../[email protected]/3-0004-fixup-Add-a-new-WAL-summarizer-process.patch.nocfbot)
download | inline diff:
From 25211044687a629e632ef0a2bfad30acea337266 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Thu, 14 Dec 2023 18:32:29 +0100
Subject: [PATCH 4/6] fixup! Add a new WAL summarizer process.
---
src/backend/backup/meson.build | 2 +-
src/backend/postmaster/walsummarizer.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/backend/backup/meson.build b/src/backend/backup/meson.build
index 0e2de91e9f..5d4ebe3ebe 100644
--- a/src/backend/backup/meson.build
+++ b/src/backend/backup/meson.build
@@ -13,5 +13,5 @@ backend_sources += files(
'basebackup_throttle.c',
'basebackup_zstd.c',
'walsummary.c',
- 'walsummaryfuncs.c'
+ 'walsummaryfuncs.c',
)
diff --git a/src/backend/postmaster/walsummarizer.c b/src/backend/postmaster/walsummarizer.c
index 7c840c36b3..9fa155349e 100644
--- a/src/backend/postmaster/walsummarizer.c
+++ b/src/backend/postmaster/walsummarizer.c
@@ -290,7 +290,7 @@ WalSummarizerMain(void)
FlushErrorState();
/* Flush any leaked data in the top-level context */
- MemoryContextResetAndDeleteChildren(context);
+ MemoryContextReset(context);
/* Now we can allow interrupts again */
RESUME_INTERRUPTS();
@@ -342,7 +342,7 @@ WalSummarizerMain(void)
XLogRecPtr end_of_summary_lsn;
/* Flush any leaked data in the top-level context */
- MemoryContextResetAndDeleteChildren(context);
+ MemoryContextReset(context);
/* Process any signals received recently. */
HandleWalSummarizerInterrupts();
--
2.43.0
view thread (14+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
Subject: Re: trying again to get incremental backup
In-Reply-To: <[email protected]>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox