Move info file checksum to the end of the file.

Putting the checksum at the beginning of the file made it impossible to stream the file out when saving.  The entire file had to be held in memory while it was checksummed so the checksum could be written at the beginning.

Instead place the checksum at the end.  This does not break the existing Perl or C code since the read is not order dependent.

There are no plans to improve the Perl code to take advantage of this change, but it will make the C implementation more efficient.

Reviewed by Cynthia Shang.

doc/xml/release.xml

@@ -49,6 +49,16 @@
                         <p>Create log directories/files with <id>0750</id>/<id>0640</id> mode.</p>
                     </release-item>
                 </release-improvement-list>
+
+                <release-development-list>
+                    <release-item>
+                        <release-item-contributor-list>
+                            <release-item-reviewer id="cynthia.shang"/>
+                        </release-item-contributor-list>
+
+                        <p>Move info file checksum to the end of the file.</p>
+                    </release-item>
+                </release-development-list>
             </release-core-list>
 
             <release-doc-list>

lib/pgBackRest/Common/Ini.pm

@@ -523,13 +523,26 @@ sub iniRender
             # Else write as stricter JSON
             else
             {
-                $strContent .= "${strKey}=" . $oJSON->encode($strValue) . "\n";
+                # Skip the checksum for now but write all other key/value pairs
+                if (!($strSection eq INI_SECTION_BACKREST && $strKey eq INI_KEY_CHECKSUM))
+                {
+                    $strContent .= "${strKey}=" . $oJSON->encode($strValue) . "\n";
+                }
             }
         }
 
         $bFirst = false;
     }
 
+    # If there is a checksum write it at the end of the file.  Having the checksum at the end of the file allows some major
+    # performance optimizations which we won't implement in Perl, but will make the C code much more efficient.
+    if (!$bRelaxed && defined($oContent->{&INI_SECTION_BACKREST}) && defined($oContent->{&INI_SECTION_BACKREST}{&INI_KEY_CHECKSUM}))
+    {
+        $strContent .=
+            "\n[" . INI_SECTION_BACKREST . "]\n" .
+            INI_KEY_CHECKSUM . '=' . $oJSON->encode($oContent->{&INI_SECTION_BACKREST}{&INI_KEY_CHECKSUM}) . "\n";
+    }
+
     # Return from function and log return values if any
     return logDebugReturn
     (

src/perl/embed.auto.c

@@ -4209,12 +4209,23 @@ static const EmbeddedModule embeddedModule[] =
             "\n"
             "else\n"
             "{\n"
+            "\n"
+            "if (!($strSection eq INI_SECTION_BACKREST && $strKey eq INI_KEY_CHECKSUM))\n"
+            "{\n"
             "$strContent .= \"${strKey}=\" . $oJSON->encode($strValue) . \"\\n\";\n"
             "}\n"
             "}\n"
+            "}\n"
             "\n"
             "$bFirst = false;\n"
             "}\n"
+            "\n\n\n"
+            "if (!$bRelaxed && defined($oContent->{&INI_SECTION_BACKREST}) && defined($oContent->{&INI_SECTION_BACKREST}{&INI_KEY_CHECKSUM}))\n"
+            "{\n"
+            "$strContent .=\n"
+            "\"\\n[\" . INI_SECTION_BACKREST . \"]\\n\" .\n"
+            "INI_KEY_CHECKSUM . '=' . $oJSON->encode($oContent->{&INI_SECTION_BACKREST}{&INI_KEY_CHECKSUM}) . \"\\n\";\n"
+            "}\n"
             "\n\n"
             "return logDebugReturn\n"
             "(\n"

test/expect/mock-all-001.log

@@ -151,7 +151,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-1]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -245,6 +244,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -412,7 +414,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-2]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -509,6 +510,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -1058,7 +1062,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-1]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1159,6 +1162,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -1253,7 +1259,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-2]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1364,6 +1369,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -1454,7 +1462,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-DIFF-1]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1560,6 +1567,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -1650,7 +1660,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-DIFF-2]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1756,6 +1765,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -1923,7 +1935,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-3]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2025,6 +2036,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -2151,7 +2165,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-4]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2253,6 +2266,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -2349,7 +2365,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-DIFF-3]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2451,6 +2466,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -2526,7 +2544,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-5]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2628,6 +2645,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -2727,7 +2747,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-DIFF-4]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2827,6 +2846,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -2922,7 +2944,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-3]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -3022,6 +3043,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -3479,7 +3503,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-DIFF-5]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -3581,6 +3604,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -3971,7 +3997,6 @@ bogus=bogus
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-DIFF-6]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -4073,6 +4098,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
@@ -4144,7 +4172,6 @@ start-fast=y
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/[BACKUP-DIFF-7]/backup.manifest
 -----------------------------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -4246,6 +4273,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-1]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]

test/expect/mock-all-002.log

@@ -141,7 +141,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-FULL-1]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -229,6 +228,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -328,7 +330,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-FULL-2]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -419,6 +420,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -619,7 +623,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-INCR-1]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -714,6 +717,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -817,7 +823,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-INCR-2]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -922,6 +927,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -1025,7 +1033,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-DIFF-1]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1126,6 +1133,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -1229,7 +1239,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-DIFF-2]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1330,6 +1339,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -1454,7 +1466,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-INCR-3]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1551,6 +1562,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -1655,7 +1669,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-INCR-4]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1752,6 +1765,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -1860,7 +1876,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-DIFF-3]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1957,6 +1972,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -2063,7 +2081,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-INCR-5]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2160,6 +2177,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -2270,7 +2290,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-DIFF-4]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2365,6 +2384,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -2470,7 +2492,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-FULL-3]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2565,6 +2586,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -3020,7 +3044,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-DIFF-5]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -3117,6 +3140,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -3403,7 +3429,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-DIFF-6]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -3500,6 +3525,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]
@@ -3611,7 +3639,6 @@ start-fast=y
 + supplemental file: /backup/db/[BACKUP-DIFF-7]/backup.manifest
 ---------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -3708,6 +3735,9 @@ group="[GROUP-1]"
 mode="0700"
 user="[USER-2]"
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 + supplemental file: /backup/db/backup.info
 -------------------------------------------
 [backrest]

test/expect/mock-expire-001.log

@@ -8,7 +8,6 @@ run 001 - simple, enc 0, s3 0
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -26,6 +25,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-1]
@@ -597,7 +599,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -616,6 +617,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-1]
@@ -949,7 +953,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -968,6 +971,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-2]
@@ -1580,7 +1586,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1601,6 +1606,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-2]
@@ -1970,7 +1978,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1990,6 +1997,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-3]
@@ -2083,7 +2093,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2102,6 +2111,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-3]
@@ -2197,7 +2209,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2219,6 +2230,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-3]
@@ -2333,7 +2347,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2354,6 +2367,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-4]
@@ -2480,7 +2496,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2503,6 +2518,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-4]
@@ -2642,7 +2660,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2666,6 +2683,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-4]
@@ -2805,7 +2825,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -2826,6 +2845,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-8]

test/expect/mock-expire-002.log

@@ -9,7 +9,6 @@ run 002 - stanzaUpgrade, enc 0, s3 0
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -28,6 +27,9 @@ db-version="9.2"
 [db:history]
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-1]
@@ -133,7 +135,6 @@ db-version="9.2"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -157,6 +158,9 @@ db-version="9.3"
 1={"db-catalog-version":201204301,"db-control-version":922,"db-system-id":1000000000000000092,"db-version":"9.2"}
 2={"db-catalog-version":201306121,"db-control-version":937,"db-system-id":1000000000000000093,"db-version":"9.3"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-1]
@@ -805,7 +809,6 @@ db-version="9.3"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -829,6 +832,9 @@ db-version="10"
 2={"db-catalog-version":201306121,"db-control-version":937,"db-system-id":1000000000000000093,"db-version":"9.3"}
 3={"db-catalog-version":201707211,"db-control-version":1002,"db-system-id":1000000000000000100,"db-version":"10"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-2]
@@ -1219,7 +1225,6 @@ db-version="10"
 + supplemental file: [TEST_PATH]/db-master/repo/backup/db/backup.info
 ---------------------------------------------------------------------
 [backrest]
-backrest-checksum="[CHECKSUM]"
 backrest-format=5
 backrest-version="[VERSION-1]"
 
@@ -1241,6 +1246,9 @@ db-version="10"
 2={"db-catalog-version":201306121,"db-control-version":937,"db-system-id":1000000000000000093,"db-version":"9.3"}
 3={"db-catalog-version":201707211,"db-control-version":1002,"db-system-id":1000000000000000100,"db-version":"10"}
 
+[backrest]
+backrest-checksum="[CHECKSUM]"
+
 > ls [TEST_PATH]/db-master/repo/backup/db | grep -v "backup.*"
 ------------------------------------------------------------------------------------------------------------------------------------
 [BACKUP-FULL-4]

test/lib/pgBackRestTest/Module/Common/CommonIniPerlTest.pm

@@ -34,12 +34,13 @@ sub iniHeader
     my $strChecksum = shift;
 
     return
-        "[backrest]" .
+        "[backrest]\n" .
-        "\nbackrest-checksum=\"" .
+        "backrest-format=" . (defined($iFormat) ? $iFormat : $oIni->get(INI_SECTION_BACKREST, INI_KEY_FORMAT)) . "\n" .
-            (defined($strChecksum) ? $strChecksum : $oIni->get(INI_SECTION_BACKREST, INI_KEY_CHECKSUM)) . "\"" .
+        "backrest-version=\"" . (defined($iVersion) ? $iVersion : $oIni->get(INI_SECTION_BACKREST, INI_KEY_VERSION)) . "\"\n" .
-        "\nbackrest-format=" . (defined($iFormat) ? $iFormat : $oIni->get(INI_SECTION_BACKREST, INI_KEY_FORMAT)) .
+        "\n" .
-        "\nbackrest-version=\"" . (defined($iVersion) ? $iVersion : $oIni->get(INI_SECTION_BACKREST, INI_KEY_VERSION)) . "\"" .
+        "[backrest]\n" .
-        "\n";
+        "backrest-checksum=\"" .
+            (defined($strChecksum) ? $strChecksum : $oIni->get(INI_SECTION_BACKREST, INI_KEY_CHECKSUM)) . "\"\n";
 }
 
 ####################################################################################################################################