db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-09-16 09:06:18 +02:00
Code Issues Releases Activity

v2.41: Backup Annotations

Browse Source 
Bug Fixes:

* Fix incorrect time expiration being used for non-default repositories. (Reviewed by Stefan Fercot. Reported by Adam Brusselback.)
* Fix issue when listing directories recursively with a filter. (Reviewed by Stephen Frost. Reported by Efremov Egor.)

Features:

* Backup key/value annotations. (Contributed by Stefan Fercot. Reviewed by David Steele. Suggested by Adam Berlin.)

Improvements:

* Support --set in JSON output for info command. (Contributed by Stefan Fercot. Reviewed by David Steele. Suggested by Anton Kurochkin.)
* Update archive.info timestamps after a successful backup. (Reviewed by Stefan Fercot. Suggested by Alex Richman.)
* Move standby timeline check after checkpoint. (Reviewed by Stefan Fercot, Keith Fiske. Suggested by Keith Fiske.)
* Improve warning message on backup resume. (Suggested by Cynthia Shang.)

Documentation Improvements:

* Add absolute path for kill in pgbackrest.service. (Suggested by Don Seiler.)
This commit is contained in:
David Steele
2022-09-19 10:08:10 -07:00
parent c39c9f220e
commit 6b355806cc
11 changed files with 984 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
CONTRIBUTING.md
View File

@@ -242,12 +242,12 @@ pgbackrest/test/test.pl --vm=none --dry-run
P00 INFO: test begin on x86_64 - log level info
P00 INFO: clean autogenerate code
P00 INFO: builds required: bin
--> P00 INFO: 74 tests selected
--> P00 INFO: 75 tests selected
P00 INFO: P1-T01/74 - vm=none, module=common, test=error
[filtered 71 lines of output]
P00 INFO: P1-T73/74 - vm=none, module=performance, test=type
P00 INFO: P1-T74/74 - vm=none, module=performance, test=storage
P00 INFO: P1-T01/75 - vm=none, module=common, test=error
[filtered 72 lines of output]
P00 INFO: P1-T74/75 - vm=none, module=performance, test=type
P00 INFO: P1-T75/75 - vm=none, module=performance, test=storage
--> P00 INFO: DRY RUN COMPLETED SUCCESSFULLY
```
@@ -258,43 +258,45 @@ pgbackrest/test/test.pl --vm=none --vm-out --module=common --test=wait
--- output ---
P00 INFO: test begin on x86_64 - log level info
P00 INFO: cleanup old data
P00 INFO: autogenerate configure
P00 INFO: autogenerated version in configure.ac script: no changes
P00 INFO: autogenerated configure script: no changes
P00 INFO: autogenerate code
P00 INFO: cleanup old data
P00 INFO: builds required: none
P00 INFO: 1 test selected
P00 INFO: P1-T1/1 - vm=none, module=common, test=wait
2022-09-19 16:10:16.785 P00 INFO: test command begin 2.41: [common/wait] --log-level=info --repo-path=/home/vagrant/test/repo --test-path=/home/vagrant/test --vm=none --vm-id=0
2022-09-19 16:10:19.212 P00 INFO: test command end: completed successfully (2428ms)
run 1 - waitNew(), waitMore, and waitFree()
L0018 expect AssertError: assertion 'waitTime <= 999999000' failed
000.010s L0018 expect AssertError: assertion 'waitTime <= 999999000' failed
run 1/1 ------------- L0021 0ms wait
L0025 new wait
L0026 check remaining time
L0027 check wait time
L0028 check sleep time
L0029 check sleep prev time
L0030 no wait more
L0033 new wait = 0.2 sec
L0034 check remaining time
L0035 check wait time
L0036 check sleep time
L0037 check sleep prev time
L0038 check begin time
L0044 lower range check
L0045 upper range check
L0047 free wait
L0052 new wait = 1.1 sec
L0053 check wait time
L0054 check sleep time
L0055 check sleep prev time
L0056 check begin time
L0062 lower range check
L0063 upper range check
L0065 free wait
000.050s 000.040s L0025 new wait
000.056s 000.006s L0026 check remaining time
000.058s 000.002s L0027 check wait time
000.059s 000.001s L0028 check sleep time
000.059s 000.000s L0029 check sleep prev time
000.060s 000.001s L0030 no wait more
000.065s 000.005s L0033 new wait = 0.2 sec
000.066s 000.001s L0034 check remaining time
000.067s 000.001s L0035 check wait time
000.068s 000.001s L0036 check sleep time
000.069s 000.001s L0037 check sleep prev time
000.070s 000.001s L0038 check begin time
000.268s 000.198s L0044 lower range check
000.268s 000.000s L0045 upper range check
000.269s 000.001s L0047 free wait
000.271s 000.002s L0052 new wait = 1.1 sec
000.272s 000.001s L0053 check wait time
000.273s 000.001s L0054 check sleep time
000.274s 000.001s L0055 check sleep prev time
000.275s 000.001s L0056 check begin time
001.373s 001.098s L0062 lower range check
001.374s 000.001s L0063 upper range check
001.375s 000.001s L0065 free wait
TESTS COMPLETED SUCCESSFULLY
@@ -313,11 +315,11 @@ pgbackrest/test/test.pl --vm=none --module=postgres
--- output ---
P00 INFO: test begin on x86_64 - log level info
P00 INFO: cleanup old data
P00 INFO: autogenerate configure
P00 INFO: autogenerated version in configure.ac script: no changes
P00 INFO: autogenerated configure script: no changes
P00 INFO: autogenerate code
P00 INFO: cleanup old data
P00 INFO: builds required: none
P00 INFO: 2 tests selected
@@ -339,7 +341,7 @@ pgbackrest/test/test.pl --vm-build --vm=u20
--- output ---
P00 INFO: test begin on x86_64 - log level info
P00 INFO: Using cached pgbackrest/test:u20-base-20220519A image (17c74ed3fd3d76119f672740d77caf873fc57bac) ...
P00 INFO: Using cached pgbackrest/test:u20-base-20220726A image (f5b22e94c4bac5589e92977a3edd52507f8fa150) ...
P00 INFO: Building pgbackrest/test:u20-test image ...
P00 INFO: Build Complete
```
@@ -352,15 +354,15 @@ pgbackrest/test/test.pl --vm=u20 --module=mock --test=archive --run=2
--- output ---
P00 INFO: test begin on x86_64 - log level info
P00 INFO: cleanup old data and containers
P00 INFO: autogenerate configure
P00 INFO: autogenerated version in configure.ac script: no changes
P00 INFO: autogenerated configure script: no changes
P00 INFO: autogenerate code
P00 INFO: cleanup old data and containers
P00 INFO: clean autogenerate code
P00 INFO: builds required: bin, bin host
P00 INFO: bin build for u20 (/home/vagrant/test/bin/u20)
P00 INFO: bin dependencies have changed, rebuilding
P00 INFO: clean bin build for none (/home/vagrant/test/bin/none)
P00 INFO: bin build for none (/home/vagrant/test/build/none)
P00 INFO: 1 test selected
P00 INFO: P1-T1/1 - vm=u20, module=mock, test=archive, run=2

2
README.md
View File

@@ -4,7 +4,7 @@
pgBackRest aims to be a reliable, easy-to-use backup and restore solution that can seamlessly scale up to the largest databases and workloads by utilizing algorithms that are optimized for database-specific requirements.
pgBackRest [v2.40](https://github.com/pgbackrest/pgbackrest/releases/tag/release/2.40) is the current stable release. Release notes are on the [Releases](http://www.pgbackrest.org/release.html) page.
pgBackRest [v2.41](https://github.com/pgbackrest/pgbackrest/releases/tag/release/2.41) is the current stable release. Release notes are on the [Releases](http://www.pgbackrest.org/release.html) page.
Please find us on [GitHub](https://github.com/pgbackrest/pgbackrest) and give us a star if you like pgBackRest!

1100
doc/resource/exe.cache
View File

File diff suppressed because it is too large Load Diff

207
doc/resource/git-history.cache
View File

@@ -1,4 +1,211 @@
[
{
"commit": "c39c9f220ed328b4175d912e109697b726e9ea9b",
"date": "2022-09-15 12:00:44 -0700",
"subject": "Fix issue when listing directories recursively with a filter.",
"body": "While recursing and filtering, if the last entry in a directory was another directory containing entries then the parent list would get freed too early, causing a double free error or segfault.\r\n\r\nFix by ensuring that the completed list is at the top of the stack before freeing it. This will defer freeing parent lists until the contents of paths have been processed."
},
{
"commit": "08a44be4c38e4bc72a20c19d764be8a673c9b909",
"date": "2022-09-14 16:22:48 -0700",
"subject": "Fix incorrect storage for rendering errors.",
"body": "Coverity complained of a copy/paste error here, but the actual error was what it took to be the correct \"copied from\" code.\n\nIn any case, the prior code would have blown up as soon as a new error type was added. Fix by updating to the writable build storage."
},
{
"commit": "240cd755d19ae2688d0deee65c00daf0651bb601",
"date": "2022-09-14 10:06:06 -0700",
"subject": "Add mem context test missing from 0f7b6a33.",
"body": "A coverage exception was added during development but was not removed before commit.\n\nRemove the exception and add a test for coverage."
},
{
"commit": "8fb61a809dc63936a78e5233a2e8bc8dc616c762",
"date": "2022-09-08 18:36:03 -0600",
"subject": "Add FN_INLINE_ALWAYS macro.",
"body": "Eliminate a lot of useless repetition for a commonly used pattern."
},
{
"commit": "2c9cbbcc4e72f5c1809e0001e40bfb3e7d8bbe01",
"date": "2022-09-08 18:16:38 -0600",
"subject": "Update Cirrus CI FreedBSD 13 image version."
},
{
"commit": "3b5df1e089234d425dd225f8c1976755dc947c8a",
"date": "2022-09-02 10:03:18 -0500",
"subject": "Update archive.info timestamps after a successful backup.",
"body": "Lifecycle policies can cause the archive.info file and its copy to be removed since they are only updated on a stanza-upgrade. Update the timestamps after a successful backup to prevent this.\r\n\r\nThis does not mean that lifecycle policies should be used as a replacement for expiration. However, in some cases there may be policies in place that are out of admin control. If the lifecycle expiration is less than pgbackrest expiration then corruption of the earliest backup will occur at the very least and there might be other corruption which would make the repo unrecoverable."
},
{
"commit": "0f7b6a3344b676d79afa7cd16ab54f67be870fdf",
"date": "2022-08-31 12:44:55 -0400",
"subject": "Skip mem context cleanup in CATCH_FATAL() block.",
"body": "An error that gets raised all the way to the top TRY block might need to free a lot of resources and any of these callbacks could throw an error and mask the original error. In fact this is pretty likely since we are already in an error state. For example, the Db object will try to close the remote db connection, but if the protocol is in a bad state it will not be able to do so.\r\n\r\nSolve this, for now, by not freeing memory or calling callbacks in the CATCH_FATAL() block. This gives us a better chance if being able to report the error without encountering another error first.\r\n\r\nFor the most part, we don't need to worry about freeing resources (file handles, TLS contexts, etc.) if the program is going to exit immediately. However, it is important to attempt to terminate all active protocol connections, which is done by protocolFree() in main() since the protocol objects live in the top context.\r\n\r\nAnother way to handle this would be to implement an error stack and that is probably something we will do in the future. But, in the case of a segfault the original error would still be lost. Yet another option would be to still do cleanup but defer it until after the CATCH_FATAL() block."
},
{
"commit": "eda7f81ee4fd6818ce458768144fc3fc1e1f0f21",
"date": "2022-08-31 10:01:12 -0400",
"subject": "Fix incorrect time expiration being used for non-default repositories.",
"body": "If a repo is not specified for the expire command then the lowest repo becomes the default. The repo-retention-full value for time was being retrieved from the default rather than a specific repo which led to an incorrect expiration being applied.\r\n\r\nGet the value from the specific repo and add a test.\r\n\r\nIt would be better if the default repo could not be queried in this case but it is not clear how to do that since the repo option is valid for expire (unlike, e.g., archive-push)."
},
{
"commit": "f1cb8485917bc07e00e77efe4593fb737f72136a",
"date": "2022-08-30 18:04:32 -0400",
"subject": "Fix comment typos in command/expire unit test."
},
{
"commit": "db75ffd27037d690a11eb02902f929250fe2bf5b",
"date": "2022-08-25 10:12:22 -0400",
"subject": "Support --set in JSON output for info command.",
"body": "Allow detailed information (e.g. error list, tablespace list) in JSON output that is already available in text output with the --set option."
},
{
"commit": "381fd0a5a4de61624615b150ba98beeafac31f7e",
"date": "2022-08-24 10:52:33 -0400",
"subject": "Backup key/value annotations.",
"body": "Allow key/value annotations to be added with the backup command and added/modified/removed with the new annotate command.\r\n\r\nAnnotations can be viewed with the info command in text mode when --set is specified and are always included in JSON output."
},
{
"commit": "b05d31f531b55b747175cf94c963f95574c54d2b",
"date": "2022-08-24 09:33:26 -0400",
"subject": "Allow upload chunk size to be configured for object stores.",
"body": "There are performance benefits to increasing the upload chunk size as long as the tradeoff with additional memory consumption is acceptable.\r\n\r\nMake the chunk size configurable for S3, GCS, and Azure, but don't attempt to do any validation of the chunk size beyond some sane limits. The defaults remain as is for each storage type to avoid any unintentional regressions."
},
{
"commit": "37b4592e522289a0523f03f8e9b144ff28fa21d3",
"date": "2022-08-24 08:45:44 -0400",
"subject": "Allow host memory limits in the user guide to be disabled.",
"body": "These limits can cause errors in some environments, e.g. Docker in Docker on Mac M1.\n\nEntirely remove limits from the build, s3, and azure hosts since memory usage on these hosts is out of our control and not useful for testing.\n\nAlso allow empty variables to be rendered as blank."
},
{
"commit": "ff1188f92dfc9e8f6d4aeca8b71a9886f24f58b4",
"date": "2022-08-22 13:51:05 -0400",
"subject": "Allow quote tag in command-line help.",
"body": "The quote tag will be used in an upcoming commit."
},
{
"commit": "2a99ac4324b52b8b42db639e645378840159af00",
"date": "2022-08-17 11:24:20 -0400",
"subject": "Clear ProtocolClient callback after connection error.",
"body": "Attempting to shut down the connection will fail since the server has already disconnected and a new error will be thrown, masking the original error."
},
{
"commit": "82786da1545c0bfe8185837a35d13a50b5e11ade",
"date": "2022-08-16 16:15:48 -0400",
"subject": "Do not allow CATCH() to catch a fatal error.",
"body": "Catching individual fatal errors was only used in testing so the tests have been updated to use other errors instead. CATCH_FATAL() is now the only way to catch fatal errors.\r\n\r\nThis simplifies the logic a bit for upcoming changes to error handling and cleanup.\r\n\r\nAlso fix an issue where passing errorMessage() directly to THROW*() would attempt to copy the message buffer instead of preserving it, which is undefined behavior. Since there were no instances of this behavior before this commit, this was not a live bug."
},
{
"commit": "02665a5894dc4b025172b32c7a1ce42c81d6c582",
"date": "2022-08-02 11:05:31 -0400",
"subject": "Update Minio test/documentation container version."
},
{
"commit": "eb287b18c882a16eecfb1445a513c4da4ccab1b7",
"date": "2022-07-29 10:31:36 -0400",
"subject": "Add profiling, performance, and optimization to C test harness.",
"body": "All unit and performance tests are now built by the C harness.\n\nRemove all unit/performance test build code from Perl.\n\nRemove code from C harness that is no longer used. This code was included so the C harness could be run separately, but that is no longer needed with this full integration."
},
{
"commit": "1e83f2a022b36191c2d12185ed57cf4d96462862",
"date": "2022-07-28 14:53:48 -0400",
"subject": "Add coverage to C test harness.",
"body": "Coverage reports are still generated in Perl, but all the settings have been added to the C harness to generate raw coverage data."
},
{
"commit": "c99ea54f17c1f26a5e996bb8cfd3df81684f813b",
"date": "2022-07-27 10:32:32 -0400",
"subject": "Integrate C test harness with Perl test harness.",
"body": "The C test harness is used for unit tests from the Perl harness where possible. Currently, unit tests can be run in the C harness when --no-coverage is specified and --profile is not specified.\n\nC harness tests work on meson 0.45.\n\nThe C harness runs with valgrind by default. Valgrind can be disabled with --no-valgrind.\n\nAlso rebuild containers to add meson and update the documentation so that meson builds will work (even though we don't do them yet)."
},
{
"commit": "2caef37fd55ea12959015f02a106774f6ad711b7",
"date": "2022-07-26 18:25:24 -0400",
"subject": "Add reviewer for c267ba51."
},
{
"commit": "e9ff5248039eedb25da2fee550ec64fcebbc51c7",
"date": "2022-07-26 15:15:12 -0400",
"subject": "Add absolute path for kill in pgbackrest.service."
},
{
"commit": "79d9884141f90a9e93fb2ec8faef15e460dd3442",
"date": "2022-07-25 09:39:54 -0400",
"subject": "Move release build check to src/meson.build.",
"body": "This allows the C harness to perform release builds which are required for some tests."
},
{
"commit": "c267ba51b1778b5872f4ee928a9614545d743f3f",
"date": "2022-07-22 16:24:55 -0400",
"subject": "Move standby timeline check after checkpoint.",
"body": "The standby timeline check was being performed using pg_control data loaded before the backup started. If the backup was started immediately after a promotion the standby might not have executed a checkpoint and written the new timeline to pg_control.\r\n\r\nInstead perform the timeline check after the checkpoint is executed. This should ensure that the new timeline is in pg_control."
},
{
"commit": "cbbe93f592d8097393c5ffe214f0a8c5fb0549c1",
"date": "2022-07-22 14:45:38 -0400",
"subject": "Improve warning message on backup resume.",
"body": "The prior warning made it sound as if some action was required on the part of the user.\n\nThe new message should make it clearer that this action will be performed by pgBackRest."
},
{
"commit": "4c47cc5d4786b88a06c38aefe628356342433f64",
"date": "2022-07-22 09:24:29 -0400",
"subject": "Remove Debian package patch now that it has been merged upstream."
},
{
"commit": "19d9941367f68d6effb516fbb1444877fea9a9ce",
"date": "2022-07-21 20:10:51 -0400",
"subject": "More C test harness improvements and CI.",
"body": "Build pgbackrest binary and auto-generated code automatically.\n\nRemove --module option and allow modules to run by parameter. This is less verbose and multiple modules can be run at a time.\n\nAllow filtering of modules. Multiple tests can be passed as parameters and if the module ends in / it will be used as a prefix filter. For example, common/ will run all the common modules.\n\nIf a test errors the remaining tests will still run but the test process will eventually exit with an error.\n\nCI tests are included but unit tests remain on the development branch.\n\nWith these changes all unit tests run except those that specify the define (e.g. common/assert-off) or containerReq (e.g. protocol/protocol) keywords.\n\nBuilding the C test harness has been simplified:\n\nmeson -Dwerror=true -Dfatal-errors=true -Dbuildtype=debug test/build/none pgbackrest\nninja -C test/build/none test/src/test-pgbackrest\n\nTo run all modules:\n\ntest/build/none/test/src/test-pgbackrest test\n\nJust the common/error module:\n\ntest/build/none/test/src/test-pgbackrest test common/error\n\nAll info modules:\n\ntest/build/none/test/src/test-pgbackrest test info/"
},
{
"commit": "edfcf1652c6ab07fe5a147b97df0c563e09d3445",
"date": "2022-07-21 19:27:58 -0400",
"subject": "Test Dockerfile improvements.",
"body": "Add tzdata package so timezone tests in command/restore work correctly.\n\nMark default git path as safe. This is a security fix that is not applicable in this environment, but must be set.\n\nAlso remove package cleanup, which is inconvenient when new packages need to be installed. It makes sense for containers that will be downloaded from Dockerhub but not so much for a locally-maintained container."
},
{
"commit": "5e5b04be3741b4e903c9a7764dadfbe5bda121ae",
"date": "2022-07-21 18:19:47 -0400",
"subject": "Fix common/lock test creating \"750\" path.",
"body": "This was clearly an attempt to set the mode when creating a directory, but it never worked and instead created a \"750\" directory in the current working directory.\n\nDetected when running in an environment where the current working directory was read-only."
},
{
"commit": "f9bbafbf3fbd67fc289cf849900799b4718dace1",
"date": "2022-07-20 19:02:14 -0400",
"subject": "C test harness improvements.",
"body": "Add harness depends when present.\n\nInclude libyaml in all test builds.\n\nFix mode on paths before trying to remove and set test path with mode 770 to match the Perl test harness.\n\nWith these changes all unit tests run except those that specify the define (e.g. common/assert-off), binReq (e.g. command/archive-get), or containerReq (e.g. protocol/protocol) keywords.\n\nBuilds and code generation need to be done in advance. The following commands are required for setup:\n\nmeson setup -Dwerror=true -Dfatal-errors=true -Dbuildtype=debug build pgbackrest\nninja -C build test/src/test-pgbackrest\nbuild/src/build-code help pgbackrest\nbuild/src/build-code postgres pgbackrest\n\nNow tests can be run, e.g.:\n\nbuild/test/src/test-pgbackrest --module=postgres/interface"
},
{
"commit": "c625f05a13e0238bf06feb26d0d8757dd2bedffd",
"date": "2022-07-20 17:45:39 -0400",
"subject": "Unify code builder binaries into a single binary.",
"body": "Creating new binaries was convenient at first but has now become a maintenance issue.\n\nSolve this by combining that into a single binary that takes an additional parameter to indicate which code should be built.\n\nAlso clean up path handling to make it easier to build code from the command line."
},
{
"commit": "7eb5d679857999faebe78730c5a30e450ef80d5c",
"date": "2022-07-19 18:03:39 -0400",
"subject": "Add module harness and shim support to the C test harness.",
"body": "This allows running unit tests up to common/ini, excluding common/debug-off and common/assert-off."
},
{
"commit": "8fdeed780787a2c6df6672f5d9c75fb7b5b613bc",
"date": "2022-07-19 17:57:13 -0400",
"subject": "Copy repository links as files for testing.",
"body": "This makes the test code a bit simpler where we are listing a path but not following links.\n\nLinks in the repository can be used for testing but should never be committed to the main branch."
},
{
"commit": "eb775790087cd8594f6649893895c42a407302cd",
"date": "2022-07-19 17:25:07 -0400",
"subject": "Fix comment typo."
},
{
"commit": "f3a10b921bf3d87152d27347df23b487877abe94",
"date": "2022-07-18 10:52:57 -0400",
"subject": "Update config.guess to latest version."
},
{
"commit": "20f9f726478a4d1c8897cc31a5bf7df52275b84f",
"date": "2022-07-18 10:49:58 -0400",
"subject": "Begin v2.41 development."
},
{
"commit": "1ff531090b9d1eccd9107592398148a51486c9f8",
"date": "2022-07-18 09:32:30 -0400",

55
doc/xml/auto/metric-coverage-report.auto.xml
View File

@@ -22,8 +22,8 @@
<table-row>
<table-cell>build/help</table-cell>
<table-cell>12/12 (100.0%)</table-cell>
<table-cell>126/126 (100.0%)</table-cell>
<table-cell>231/231 (100.0%)</table-cell>
<table-cell>128/128 (100.0%)</table-cell>
<table-cell>235/235 (100.0%)</table-cell>
</table-row>
<table-row>
@@ -40,6 +40,13 @@
<table-cell>158/158 (100.0%)</table-cell>
</table-row>
<table-row>
<table-cell>command/annotate</table-cell>
<table-cell>1/1 (100.0%)</table-cell>
<table-cell>12/12 (100.0%)</table-cell>
<table-cell>33/33 (100.0%)</table-cell>
</table-row>
<table-row>
<table-cell>command/archive</table-cell>
<table-cell>13/13 (100.0%)</table-cell>
@@ -58,14 +65,14 @@
<table-cell>command/archive/push</table-cell>
<table-cell>12/12 (100.0%)</table-cell>
<table-cell>132/132 (100.0%)</table-cell>
<table-cell>407/407 (100.0%)</table-cell>
<table-cell>406/406 (100.0%)</table-cell>
</table-row>
<table-row>
<table-cell>command/backup</table-cell>
<table-cell>36/36 (100.0%)</table-cell>
<table-cell>536/536 (100.0%)</table-cell>
<table-cell>1268/1268 (100.0%)</table-cell>
<table-cell>538/538 (100.0%)</table-cell>
<table-cell>1265/1265 (100.0%)</table-cell>
</table-row>
<table-row>
@@ -99,8 +106,8 @@
<table-row>
<table-cell>command/info</table-cell>
<table-cell>12/12 (100.0%)</table-cell>
<table-cell>328/328 (100.0%)</table-cell>
<table-cell>667/667 (100.0%)</table-cell>
<table-cell>330/330 (100.0%)</table-cell>
<table-cell>676/676 (100.0%)</table-cell>
</table-row>
<table-row>
@@ -155,8 +162,8 @@
<table-row>
<table-cell>common</table-cell>
<table-cell>176/176 (100.0%)</table-cell>
<table-cell>596/596 (100.0%)</table-cell>
<table-cell>1991/1991 (100.0%)</table-cell>
<table-cell>600/600 (100.0%)</table-cell>
<table-cell>1995/1995 (100.0%)</table-cell>
</table-row>
<table-row>
@@ -238,30 +245,30 @@
<table-row>
<table-cell>common/type</table-cell>
<table-cell>328/328 (100.0%)</table-cell>
<table-cell>850/850 (100.0%)</table-cell>
<table-cell>4220/4220 (100.0%)</table-cell>
<table-cell>329/329 (100.0%)</table-cell>
<table-cell>852/852 (100.0%)</table-cell>
<table-cell>4237/4237 (100.0%)</table-cell>
</table-row>
<table-row>
<table-cell>config</table-cell>
<table-cell>88/88 (100.0%)</table-cell>
<table-cell>882/882 (100.0%)</table-cell>
<table-cell>1743/1743 (100.0%)</table-cell>
<table-cell>888/888 (100.0%)</table-cell>
<table-cell>1746/1746 (100.0%)</table-cell>
</table-row>
<table-row>
<table-cell>db</table-cell>
<table-cell>24/24 (100.0%)</table-cell>
<table-cell>126/126 (100.0%)</table-cell>
<table-cell>432/432 (100.0%)</table-cell>
<table-cell>433/433 (100.0%)</table-cell>
</table-row>
<table-row>
<table-cell>info</table-cell>
<table-cell>92/92 (100.0%)</table-cell>
<table-cell>818/818 (100.0%)</table-cell>
<table-cell>2315/2315 (100.0%)</table-cell>
<table-cell>93/93 (100.0%)</table-cell>
<table-cell>846/846 (100.0%)</table-cell>
<table-cell>2366/2366 (100.0%)</table-cell>
</table-row>
<table-row>
@@ -282,14 +289,14 @@
<table-cell>protocol</table-cell>
<table-cell>55/55 (100.0%)</table-cell>
<table-cell>232/232 (100.0%)</table-cell>
<table-cell>954/954 (100.0%)</table-cell>
<table-cell>959/959 (100.0%)</table-cell>
</table-row>
<table-row>
<table-cell>storage</table-cell>
<table-cell>53/53 (100.0%)</table-cell>
<table-cell>226/226 (100.0%)</table-cell>
<table-cell>779/779 (100.0%)</table-cell>
<table-cell>228/228 (100.0%)</table-cell>
<table-cell>775/775 (100.0%)</table-cell>
</table-row>
<table-row>
@@ -336,7 +343,7 @@
<table-row>
<table-cell>TOTAL</table-cell>
<table-cell>1529/1529 (100.0%)</table-cell>
<table-cell>8931/8932 (99.99%)</table-cell>
<table-cell>27726/27726 (100.0%)</table-cell>
<table-cell>1532/1532 (100.0%)</table-cell>
<table-cell>8991/8992 (99.99%)</table-cell>
<table-cell>27845/27845 (100.0%)</table-cell>
</table-row>

4
doc/xml/release.xml
View File

@@ -14,7 +14,7 @@
</intro>
<release-list>
<release date="XXXX-XX-XX" version="2.41dev" title="UNDER DEVELOPMENT">
<release date="2022-09-19" version="2.41" title="Backup Annotations">
<release-core-list>
<release-bug-list>
<release-item>
@@ -27,7 +27,7 @@
<release-item-reviewer id="stefan.fercot"/>
</release-item-contributor-list>
<p>Fix incorrect time expiration being used for non-default repos.</p>
<p>Fix incorrect time expiration being used for non-default repositories.</p>
</release-item>
<release-item>

2
meson.build
View File

@@ -4,7 +4,7 @@
project(
'pgbackrest',
['c'],
version: '2.41dev',
version: '2.41',
license: 'MIT',
meson_version: '>=0.45',
default_options: [

2
src/build/configure.ac
View File

@@ -1,7 +1,7 @@
# Initialize configuration
# ----------------------------------------------------------------------------------------------------------------------------------
AC_PREREQ([2.71])
AC_INIT([pgBackRest], [2.41dev])
AC_INIT([pgBackRest], [2.41])
AC_CONFIG_SRCDIR([version.h])
AC_CONFIG_AUX_DIR(build)

20
src/configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for pgBackRest 2.41dev.
# Generated by GNU Autoconf 2.71 for pgBackRest 2.41.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -607,8 +607,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='pgBackRest'
PACKAGE_TARNAME='pgbackrest'
PACKAGE_VERSION='2.41dev'
PACKAGE_STRING='pgBackRest 2.41dev'
PACKAGE_VERSION='2.41'
PACKAGE_STRING='pgBackRest 2.41'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1272,7 +1272,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures pgBackRest 2.41dev to adapt to many kinds of systems.
\`configure' configures pgBackRest 2.41 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1319,7 +1319,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of pgBackRest 2.41dev:";;
short | recursive ) echo "Configuration of pgBackRest 2.41:";;
esac
cat <<\_ACEOF
@@ -1414,7 +1414,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
pgBackRest configure 2.41dev
pgBackRest configure 2.41
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1570,7 +1570,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by pgBackRest $as_me 2.41dev, which was
It was created by pgBackRest $as_me 2.41, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4831,7 +4831,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by pgBackRest $as_me 2.41dev, which was
This file was extended by pgBackRest $as_me 2.41, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4895,7 +4895,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
pgBackRest config.status 2.41dev
pgBackRest config.status 2.41
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
@@ -5599,4 +5599,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
# Generated from src/build/configure.ac sha1 305345b758fe3b5049a429c9ef5d67f38dd1f118
# Generated from src/build/configure.ac sha1 f5f21c49917c8e4e3757a6a7ab07298a5fe55e9f

2
src/version.h
View File

@@ -33,6 +33,6 @@ repository will be invalid unless migration functions are written.
/***********************************************************************************************************************************
Software version
***********************************************************************************************************************************/
#define PROJECT_VERSION "2.41dev"
#define PROJECT_VERSION "2.41"
#endif

26
test/code-count/file-type.yaml
View File

@@ -195,10 +195,6 @@ src/build/config/config.yaml:
class: build
type: yaml
src/build/config/main.c:
class: build
type: c
src/build/config/parse.c:
class: build
type: c
@@ -223,10 +219,6 @@ src/build/error/error.yaml:
class: build
type: yaml
src/build/error/main.c:
class: build
type: c
src/build/error/parse.c:
class: build
type: c
@@ -247,10 +239,6 @@ src/build/help/help.xml:
class: build
type: make
src/build/help/main.c:
class: build
type: c
src/build/help/parse.c:
class: build
type: c
@@ -271,7 +259,7 @@ src/build/install-sh:
class: build
type: make
src/build/postgres/main.c:
src/build/main.c:
class: build
type: c
@@ -295,6 +283,14 @@ src/build/postgres/render.h:
class: build
type: c/h
src/command/annotate/annotate.c:
class: core
type: c
src/command/annotate/annotate.h:
class: core
type: c/h
src/command/archive/common.c:
class: core
type: c
@@ -2231,6 +2227,10 @@ test/src/module/build/postgresTest.c:
class: test/module
type: c
test/src/module/command/annotateTest.c:
class: test/module
type: c
test/src/module/command/archiveCommonTest.c:
class: test/module
type: c