diff --git a/doc/xml/release.xml b/doc/xml/release.xml index eb9420424..5266a21fb 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -205,6 +205,10 @@

Split test modules into separate files to make the code more maintainable. Tests are dynamically loaded by name rather than requiring an if-else block.

 + + +

Added expect log expression to replace year subdirectories in backup.history.

+ diff --git a/test/expect/backup-synthetic-001.log b/test/expect/backup-synthetic-001.log index 7a9a732e7..6ef0d1a5c 100644 --- a/test/expect/backup-synthetic-001.log +++ b/test/expect/backup-synthetic-001.log @@ -223,7 +223,7 @@ P00 INFO: new backup label = [BACKUP-FULL-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/2016/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = false P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1], strSourcePathType = backup:cluster @@ -757,7 +757,7 @@ P00 INFO: new backup label = [BACKUP-FULL-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2], strSourcePathType = backup:cluster @@ -1640,7 +1640,7 @@ P00 INFO: new backup label = [BACKUP-INCR-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1], strSourcePathType = backup:cluster @@ -1965,7 +1965,7 @@ P00 INFO: new backup label = [BACKUP-INCR-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2], strSourcePathType = backup:cluster diff --git a/test/expect/backup-synthetic-002.log b/test/expect/backup-synthetic-002.log index a90653194..0a9bcf216 100644 --- a/test/expect/backup-synthetic-002.log +++ b/test/expect/backup-synthetic-002.log @@ -208,7 +208,7 @@ P00 INFO: new backup label = [BACKUP-FULL-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/2016/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = false P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1], strSourcePathType = backup:cluster @@ -523,7 +523,7 @@ P00 INFO: new backup label = [BACKUP-FULL-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2], strSourcePathType = backup:cluster @@ -1202,7 +1202,7 @@ P00 INFO: new backup label = [BACKUP-INCR-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1], strSourcePathType = backup:cluster @@ -1573,7 +1573,7 @@ P00 INFO: new backup label = [BACKUP-INCR-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2], strSourcePathType = backup:cluster diff --git a/test/expect/backup-synthetic-003.log b/test/expect/backup-synthetic-003.log index c25d994e6..5a5c4ee35 100644 --- a/test/expect/backup-synthetic-003.log +++ b/test/expect/backup-synthetic-003.log @@ -208,7 +208,7 @@ P00 INFO: new backup label = [BACKUP-FULL-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/2016/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = false P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1], strSourcePathType = backup:cluster @@ -521,7 +521,7 @@ P00 INFO: new backup label = [BACKUP-FULL-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2], strSourcePathType = backup:cluster @@ -1157,7 +1157,7 @@ P00 INFO: new backup label = [BACKUP-INCR-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1], strSourcePathType = backup:cluster @@ -1461,7 +1461,7 @@ P00 INFO: new backup label = [BACKUP-INCR-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2], strSourcePathType = backup:cluster diff --git a/test/expect/backup-synthetic-004.log b/test/expect/backup-synthetic-004.log index 38b9b1178..f9002bff6 100644 --- a/test/expect/backup-synthetic-004.log +++ b/test/expect/backup-synthetic-004.log @@ -208,7 +208,7 @@ P00 INFO: new backup label = [BACKUP-FULL-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/2016/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = false P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1], strSourcePathType = backup:cluster @@ -522,7 +522,7 @@ P00 INFO: new backup label = [BACKUP-FULL-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-FULL-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2], strSourcePathType = backup:cluster @@ -1200,7 +1200,7 @@ P00 INFO: new backup label = [BACKUP-INCR-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1], strSourcePathType = backup:cluster @@ -1570,7 +1570,7 @@ P00 INFO: new backup label = [BACKUP-INCR-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/db-master/repo/temp/db.tmp to [TEST_PATH]/db-master/repo/backup/db/[BACKUP-INCR-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2], strSourcePathType = backup:cluster diff --git a/test/expect/backup-synthetic-005.log b/test/expect/backup-synthetic-005.log index 53fffd0ea..dbb2002d6 100644 --- a/test/expect/backup-synthetic-005.log +++ b/test/expect/backup-synthetic-005.log @@ -201,7 +201,7 @@ P00 INFO: new backup label = [BACKUP-FULL-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-FULL-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/2016/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = false P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1], strSourcePathType = backup:cluster @@ -886,7 +886,7 @@ P00 INFO: new backup label = [BACKUP-FULL-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-FULL-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2], strSourcePathType = backup:cluster @@ -1549,7 +1549,7 @@ P00 INFO: new backup label = [BACKUP-INCR-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-INCR-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1], strSourcePathType = backup:cluster @@ -1867,7 +1867,7 @@ P00 INFO: new backup label = [BACKUP-INCR-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-INCR-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2], strSourcePathType = backup:cluster diff --git a/test/expect/backup-synthetic-006.log b/test/expect/backup-synthetic-006.log index e07e949fc..7a65d2442 100644 --- a/test/expect/backup-synthetic-006.log +++ b/test/expect/backup-synthetic-006.log @@ -201,7 +201,7 @@ P00 INFO: new backup label = [BACKUP-FULL-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-FULL-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/2016/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = false P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1], strSourcePathType = backup:cluster @@ -531,7 +531,7 @@ P00 INFO: new backup label = [BACKUP-FULL-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-FULL-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2], strSourcePathType = backup:cluster @@ -1227,7 +1227,7 @@ P00 INFO: new backup label = [BACKUP-INCR-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-INCR-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1], strSourcePathType = backup:cluster @@ -1608,7 +1608,7 @@ P00 INFO: new backup label = [BACKUP-INCR-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-INCR-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2], strSourcePathType = backup:cluster diff --git a/test/expect/backup-synthetic-007.log b/test/expect/backup-synthetic-007.log index 52ed20ff9..2b0346ee2 100644 --- a/test/expect/backup-synthetic-007.log +++ b/test/expect/backup-synthetic-007.log @@ -201,7 +201,7 @@ P00 INFO: new backup label = [BACKUP-FULL-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-FULL-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/2016/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = false P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1], strSourcePathType = backup:cluster @@ -528,7 +528,7 @@ P00 INFO: new backup label = [BACKUP-FULL-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-FULL-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2], strSourcePathType = backup:cluster @@ -1180,7 +1180,7 @@ P00 INFO: new backup label = [BACKUP-INCR-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-INCR-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1], strSourcePathType = backup:cluster @@ -1493,7 +1493,7 @@ P00 INFO: new backup label = [BACKUP-INCR-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-INCR-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2], strSourcePathType = backup:cluster diff --git a/test/expect/backup-synthetic-008.log b/test/expect/backup-synthetic-008.log index 8a43af5b0..03b14a603 100644 --- a/test/expect/backup-synthetic-008.log +++ b/test/expect/backup-synthetic-008.log @@ -201,7 +201,7 @@ P00 INFO: new backup label = [BACKUP-FULL-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-FULL-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/2016/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = false, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = false P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-1], strSourcePathType = backup:cluster @@ -529,7 +529,7 @@ P00 INFO: new backup label = [BACKUP-FULL-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-FULL-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-FULL-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-FULL-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-FULL-2], strSourcePathType = backup:cluster @@ -1223,7 +1223,7 @@ P00 INFO: new backup label = [BACKUP-INCR-1] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-INCR-1] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-1], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-1].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-1], strSourcePathType = backup:cluster @@ -1602,7 +1602,7 @@ P00 INFO: new backup label = [BACKUP-INCR-2] P00 DEBUG: File->copy(): bAppendChecksum = , bDestinationCompress = true, bDestinationPathCreate = , bIgnoreMissingSource = , bPathSync = , bSourceCompressed = , lModificationTime = [undef], strDestinationFile = backup.manifest.gz, strDestinationPathType = backup:tmp, strExtraFunction = [undef], strGroup = [undef], strMode = <0640>, strSourceFile = backup.manifest, strSourcePathType = backup:tmp, strUser = [undef] P00 DEBUG: Backup->process: move [TEST_PATH]/backup/repo/temp/db.tmp to [TEST_PATH]/backup/repo/backup/db/[BACKUP-INCR-2] P00 DEBUG: File->move(): bDestinationPathCreate = , bPathSync = , strDestinationFile = [BACKUP-INCR-2], strDestinationPathType = backup:cluster, strSourceFile = [undef], strSourcePathType = backup:tmp -P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/2016/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster +P00 DEBUG: File->move(): bDestinationPathCreate = true, bPathSync = true, strDestinationFile = backup.history/[YEAR-1]/[BACKUP-INCR-2].manifest.gz, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2]/backup.manifest.gz, strSourcePathType = backup:cluster P00 DEBUG: File->remove(): bIgnoreMissing = , bPathSync = , bTemp = [undef], strPath = latest, strPathType = backup:cluster P00 DEBUG: File->remove=>: bRemoved = true P00 DEBUG: File->linkCreate(): bHard = , bPathCreate = , bRelative = true, strDestinationFile = latest, strDestinationPathType = backup:cluster, strSourceFile = [BACKUP-INCR-2], strSourcePathType = backup:cluster diff --git a/test/lib/pgBackRestTest/Common/LogTest.pm b/test/lib/pgBackRestTest/Common/LogTest.pm index 92429da87..a0e5ea488 100644 --- a/test/lib/pgBackRestTest/Common/LogTest.pm +++ b/test/lib/pgBackRestTest/Common/LogTest.pm @@ -349,6 +349,7 @@ sub regExpReplaceAll $strLine = $self->regExpReplace($strLine, 'CONTAINER-EXEC', '^docker exec -u [a-z]*', '^docker exec -u [a-z]*', false); $strLine = $self->regExpReplace($strLine, 'PROCESS-ID', 'sent term signal to process [0-9]+', '[0-9]+$', false); + $strLine = $self->regExpReplace($strLine, 'YEAR', ' \= backup\.history\/20[0-9]{2}', '20[0-9]{2}$'); $strLine = $self->regExpReplace($strLine, 'BACKUP-INCR', '[0-9]{8}\-[0-9]{6}F\_[0-9]{8}\-[0-9]{6}I'); $strLine = $self->regExpReplace($strLine, 'BACKUP-DIFF', '[0-9]{8}\-[0-9]{6}F\_[0-9]{8}\-[0-9]{6}D');